Re: [PATCH] rebase -p: Preserve fast-forwardable merges

Hi,

On Fri, 22 Jan 2010, Alex Scarborough wrote:

Previously, rebase -p would not preserve a merge commit if the merge
could be resolved as a fast-forward.  rebase -p now passes --no-ff to
git merge when recreating a merge commit, which ensures that merge
commits created with git merge --no-ff are preserved.

For my use case (well, it used to be my use case), namely keeping a number 
of topic branches on top of an upstream up-to-date, this is not the 
desired action.  In my use case, merged topic branches should just vanish, 
and not even leave a merge commit.

First patch, so here's hoping neither I nor my mail client messed up
too much.

I think you did real fine, even providing a test case, which not many 
submitters do!

Ciao,
Dscho