On 2008-11-04 23:30:56 +0100, Christian MICHON wrote:
> note the merge can work, but it's still done in 2 steps. :(
> thanks for suggesting this.
If it had worked, you'd have gotten just one merge commit. What you
want to do is entirely possible, but it seems the high-level commands
were not designed with your use-case in mind.
Another thing you could try is to merge the two branches separately,
getting a history like this:
p1----\
\
p2---A--B
/
p3--
And then use grafts to convince git that B has parents p1, p2, and p3
(instead of its actual parents p1 and A). (Grep for "graft" in the
Documentation directory.)
And then use git-filter-branch to rewrite history so that the grafted
history becomes the real history.
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
--
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
