From: Martin von Zweigbergk Date: Tue, 28 Dec 2010 09:30:45 GMT Subject: [PATCH 28/31] rebase -m: don't print exit code 2 when merge fails Message-ID: <1293528648-21873-29-git-send-email-martin.von.zweigbergk@gmail.com> In-Reply-To: <1293528648-21873-1-git-send-email-martin.von.zweigbergk@gmail.com> 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 --- git-rebase--merge.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 705d2f5..4ea3ca7 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -78,7 +78,7 @@ call_merge () { die "$RESOLVEMSG" ;; 2) - echo "Strategy: $rv $strategy failed, try another" 1>&2 + echo "Strategy: $strategy failed, try another" 1>&2 die "$RESOLVEMSG" ;; *) -- 1.7.3.2.864.gbbb96