Remove old git commits

Question

I'm very new to git, and was wondering if something like this is possible?

>git log --pretty=oneline --abbrev-commit 2f05aba Added new feature 3371cec Fixed screw up    <-- I want to remove this daed25c Screw up          <-- and remove this. e2b2a84 First.                So it's like they never happend. 

Is this possible?

Answer 1

If you truly wish to delete them (wiping them from history, never to be seen any more), you can

run rebase:

git rebase -i HEAD~4 

and then, just delete (or comment out) the lines corresponding to the commits you wish to delete, like so:

pick 2f05aba ... #will be preserved #pick 3371cec ... #will be deleted #pick daed25c ... #will be deleted pick e2b2a84 ... #will be preserved 

Answer 2

This is possible with git rebase. Try the following

git rebase -i HEAD~4 

and then, follow the interactive instructions in your editor. In the first step you "squash" the commits. It should look something like this:

pick 2f05aba ... will be preserved squash 3371cec ... will be squashed with daed25c squash daed25c ... will be squashed with e2b2a84 pick e2b2a84 .. will contain this and 3371cec and daed25c 

In the second step you can edit the commit messages.