git reset HEAD~1 --soft
git commit --amend --no-edit
or
git reset HEAD~2 --soft
git commit -C ORIG_HEAD^ --reset-author
or
head=`git log -1 --pretty=%H HEAD~1`
git reset HEAD~2 --hard
git merge --squash ORIG_HEAD
git commit -C $head --reset-author
or
head=`git log -1 --pretty=%h HEAD~1`
git reset HEAD~2 --hard
git cherry-pick -n HEAD..ORIG_HEAD
git commit -C $head --reset-author
The first is enough in your case. The other three are just for fun here, which might be useful in other cases.
Update: the explanation of the second:
Suppose we have A-B-C as the latest three commits and C is the head. What you want is to squash B and C into a single commit which reuses B's commit message.
git reset HEAD~2 --soft resets HEAD to A and keeps the changes of B and C in the index and in the working tree. Then a following git commit creates a commit that includes the changes in the index, aka the changes of B and C.
As its name implies, ORIG_HEAD points to the original head, in this case the one before last reset, which is C. And ORIG_HEAD^ means the first parent of ORIG_HEAD, which is B. -C ORIG_HEAD^ means to reuse the commit message of B without edit.
More about --soft, -C and --reset-author.
Every time I want to fixup my latest commit,
This can be done directly:
git commit --amend
For older commits:
git commit --fixup $commit
git rebase HEAD~n -i --autosquash
This will automatically interpret the fixup! prefixes generated earlier by --fixup (or manually).
I'm still looking for a "canonical" solution with Git itself.
Here's my temporary solution workaround:
EDITOR="sed -i "2s/pick/fixup/'" git rebase -i HEAD~2
Basically just replaced an interactive text editor with sed.
This seems to work for me, full automatic and does does not require any specific sha or anything:
git commit -a --fixup HEAD ; GIT_SEQUENCE_EDITOR=touch git rebase --interactive --autosquash HEAD~2