From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 20 Mar 2009 22:04:25 GMT
Subject: Re: [PATCH] rebase -p: Preserve --no-ff merges
Message-ID: <alpine.DEB.1.00.0903202300360.6865@intel-tinevez-2-302>
In-Reply-To: <alpine.DEB.2.00.0903201633440.4457@vinegar-pot.mit.edu>

Hi,

On Fri, 20 Mar 2009, Anders Kaseorg wrote:

> Previously, git rebase -p would turn some merges that had been constructed 
> with git merge --no-ff into fast-forwards.  Now it reconstructs those 
> merges using --no-ff as well.
> 
> Signed-off-by: Anders Kaseorg <andersk@mit.edu>
> ---

First, could I ask you to hold off with patches for rebase -p for a little 
while?  I did a _lot_ of work on rebase -p recently, but it has not 
reached a state that I can submit yet without being ashamed.

Another thing to keep in mind is that some merges do _not_ want to be 
preserved.  IOW if you have a history like this:

- A - B
    \   \
      C - D - E

And your upstream cherry-picked B, after a rebase you are most likely to 
want

- A' - C' - E'

as a result (rather than

- A' - --
     \    \
       C' - D' - E'

which would be rather awkward).

Ciao,
Dscho

P.S.: FWIW you can see my work as part of my 'master' in 
http://repo.or.cz/w/git/dscho.git/