Maaartin [off-list ref] writes:
I've made a couple of trivial commits I'd like to fold into a single commit now.
In the manpage of git-rebase I saw a recipe how to do it using rebase -i and it
seemed quite trivial, but it doesn't work for me. I'm in a clean state on branch
master and want fold the last 3 commits into one - this is probably the most
trivial use case. Whatever I try I get an empty .git/rebase-merge/git-rebase-
todo, so I can't get to the point of using <<If you want to fold two or more
commits into one, replace the command "pick" for the second and subsequent
commits with "squash" or "fixup".>>
Which exact command did you type? Something like this should do it:
git rebase -i HEAD~3
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Matthieu Moy <Matthieu.Moy <at> grenoble-inp.fr> writes:
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.
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.