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@xxxxxxx>
> ---
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/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
