summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-28 02:35:24 -0500
committerJunio C Hamano <junkio@cox.net>2006-12-28 19:06:16 -0800
commita970e84e8ad23a740e456fb4191ed61becef8989 (patch)
tree717944e62c7f690eff7becc181f544d2bb6bfcbd /git-am.sh
parent7ba3c078c76cbda00f7ed2ac16a659d8f48631ba (diff)
downloadgit-a970e84e8ad23a740e456fb4191ed61becef8989.tar.gz
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>
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions