Junio C Hamano [off-list ref] writes:
git does _not_ implement a handy Porcelain to do this, but we could script
it like this (I am only illustrating that it can be done, but I am leaving
the reason why git chooses not to to a later part of this message).
Actually, another way to do this is
git commit -a
git rebase origin/where-you-want-to-merge-from
git reset HEAD^
That would not necessarily be a good way to implement a command, but I
often use variants of this interactively.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/