Allow git-merge not to commit.
commit4f692b19788364ed0bd65983579edcd6e5444f2b
authorJunio C Hamano <junkio@cox.net>
Sat, 22 Oct 2005 11:45:15 +0000 (22 04:45 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 22 Oct 2005 11:45:15 +0000 (22 04:45 -0700)
tree3d3d78c2e975724c8fc5517b3b9a243a000a53ba
parent6b32884a09e4b51e60819351200a5b10d9dc053b
Allow git-merge not to commit.

Martin Langhoff wants to use git-merge from outside git-pull and wants
to do further processing; for this, he wants git-merge no to commit
even when it cleanly merges.  I think other script writers would want
something like that as well, so here it is.

Instead of the "merge commit message" parameter (which usually is made
for you by "git-pull" which calls this command), you pass an empty
string to it.  Then it will not update your HEAD -- you can do whatever
you want with the resulting index file, which contains the merge results.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh