projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b3e4847) | patch
rebase -m: don't print exit code 2 when merge fails
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Sun, 6 Feb 2011 18:43:57 +0000 (13:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 22:08:09 +0000 (14:08 -0800)
commitb325680930c007f87d35fdc60566b3441fedc7c3
treeea2a77944186f4996439a08783589247c339ceddtree | snapshot
parentb3e4847e50cf0ab3da4ad9664a5e4382e778ebd5commit | diff
rebase -m: don't print exit code 2 when merge fails

When the merge strategy fails, a message suggesting the user to try
another strategy is displayed. Remove the "$rv" (which is always equal
to "2" in this case) from that message.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--merge.sh diff | blob | history
Git—the stupid content tracker