----- Original Message -----
From: Joshua Jensen
Date: 10/20/2010 11:44 AM
----- Original Message -----
From: Jonathan Nieder
Date: 10/20/2010 11:32 AM
I'm sorry to break this news, but "rebase --interactive
--preserve-merges"
(unlike "rebase --preserve-merges" without --interactive) was never
implemented completely. See the BUGS section of the git-rebase man
page.
Luckily, there is a roadmap for anyone interested in implementing
it. Maybe
it could be you? See [1] and the surrounding thread.
Thanks for your interest,
Jonathan
[1]
http://thread.gmane.org/gmane.comp.version-control.git/148059/focus=148144
I applied that patch to my git-rebase--interactive, although it did
not cleanly apply. I hacked a few bits to get it going again. I
could post the entire file here, if someone wants to clean it up.
It does properly rebase the first-parent merges fine.
Never mind. I applied this patch:
http://marc.info/?l=git&m=119379735525213&w=2
Josh
--
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