Allow merging bare trees in merge-recursive.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:24 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Fri, 29 Dec 2006 03:06:16 +0000 (19:06 -0800)
commita970e84e8ad23a740e456fb4191ed61becef8989
tree717944e62c7f690eff7becc181f544d2bb6bfcbd
parent7ba3c078c76cbda00f7ed2ac16a659d8f48631ba
Allow merging bare trees in merge-recursive.

To support wider use cases, such as from within `git am -3`, the
merge-recursive utility needs to accept not just commit-ish but
also tree-ish as arguments on its command line.

If given a tree-ish then merge-recursive will create a virtual commit
wrapping it, with the subject of the commit set to the best name we
can derive for that tree, which is either the command line string
(probably the SHA1), or whatever string appears in GITHEAD_*.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c