On Mon, Jul 30, 2007 at 01:24:43AM -0700, Junio C Hamano wrote:
> But it is not hard. If it is a fast forward in reality but you
> are marking it as a real merge by creating a merge commit, then:
Of course, I was not thinking right. I was considering the difficulty of
invoking the merge machinery, but of course by definition for a
fast-forward you don't have to.
> when other is a fast forward of HEAD would do:
>
> git commit-tree other^{tree} -p HEAD -p other
Yes, that makes sense.
-Peff
-
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
