On Jul 30, 2007, at 10:14 AM, Jeff King wrote:
How about "git commit-tree HEAD^{tree} -p HEAD"?
Thanks, I wasn't aware of this syntax.
But I think making a "fake" commit to force non-fast-forward is the wrong thing. You really want to make your "extra" commit be the merge that wouldn't have happened (which unfortunately is not as simple as just creating a commit by hand, since you have to actually _do_ the merge to get the tree).
I agree. But I think except for being 'fake' there shouldn't be any problems with the extra commit. Steffen - 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