Re: Folding commits together

On Wed, Sep 22, 2010 at 7:33 AM, Maaartin [off-list ref] wrote:

Matthieu Moy <Matthieu.Moy <at> grenoble-inp.fr> writes:

quoted

Which exact command did you type? Something like this should do it:

git rebase -i HEAD~3

I've tried nearly everything, starting with

git rebase -i d8e3842

which should be the just the same as HEAD~3. I retract the question, my editor
keeps opening a wrong file, which I've just spotted by accident. The problem was
caused by a git-cygwin-emacsclient-emacs interaction, rebase works nicely.

Another way to do this if it's the top-most commits is:

$ git reset --soft HEAD~3
$ git commit --amend

j.