On Wed, 14 Feb 2007, Johannes Schindelin wrote:
>
> The chance of a mismerge is somewhat real, though. At first I thought that
> you'd need a special script anyway, until I realized that it's just a
> matter of "git merge -s theirs <from-devel>".
In fact, it's even quite doable as
git commit-tree theirs^{tree} -p HEAD -p theirs < changelog
(choose your parent order at will) so it's not as if it's much of a
"script". It's a core command to do something like this.
Using "git commit -s theirs" might not work (shouldn't, but I didn't test)
for the first entry, so you probably *do* want to script this regardless.
But git makes it really really easy.
Linus
-
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