2

Warning: Git newbie

I know the basic git commit and pull, push and currently using source tree for github. Right now I am working on a project where i forked a repo. and accidentally optimized over 300+ images. Good thing is I separated all the images in one commit. The client requested a pull request which I have done. He also said that I should not have optimized these images and to delete this commit from the pull request.

The commit with the images has been pushed many commits ago so it is hard to wrap my head around this. What I thought would work is if i reset the repo back to this commit and delete the images and push again. but by deleting the images, i reset the images so they would be back to what they originally were and when i pushed the changes, it doesn't show anything was changed with the images with the new commit.

Not sure if I am making myself clear. What is the best way to go about this?

user3730179
  • 121
  • 4
  • 14

1 Answers1

2

1) Find the hash of the commit with the images. Suppose it is COMMIT. Then in the console type in (note to add ^ after the commit hash):

git rebase -i COMMIT^

Git will open an editor. Delete the first line, corresponding to the commit with images. Save the file and exit the editor. Git will rewrite your history and exclude the commit with images. Then push your new history to the remote repo adding --force option:

git push --force origin master

Make pull request.

2) Instead of interactive rebase you can use this in your case:

git rebase --onto COMMIT^ COMMIT master

3) And you can also leave your history as it is and cancel just that commit:

git revert COMMIT
user2683246
  • 3,399
  • 29
  • 31
  • now he wants me to reset all the commits and squash all code into one commit – user3730179 Mar 29 '16 at 21:21
  • Suppose that CCC is the last commit before yours. `git reset --soft CCC`. You'll get all your changes staged but not committed. Commit them and push with `--force`. – user2683246 Mar 30 '16 at 05:42
  • While interactive rebasing (1), you could delete first line, then substitute the first "pick" for "reword" and all the others for "fixup". Save, exit. Write a new commit message, save, exit, push. – user2683246 Mar 30 '16 at 05:48
  • http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git – user2683246 Mar 30 '16 at 05:50