From: Martin von Zweigbergk Date: Tue, 28 Dec 2010 09:30:37 GMT Subject: [PATCH 20/31] rebase: show consistent conflict resolution hint Message-ID: <1293528648-21873-21-git-send-email-martin.von.zweigbergk@gmail.com> In-Reply-To: <1293528648-21873-1-git-send-email-martin.von.zweigbergk@gmail.com> When rebase stops due to conflict, interactive rebase currently displays a different hint to the user than non-interactive rebase does. Use the same message for both types of rebase. Signed-off-by: Martin von Zweigbergk --- Should we include the "mark the corrected paths with 'git add '" part? git-rebase--interactive.sh | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0beeb8b..e848ea2 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -81,9 +81,7 @@ AMEND="$DOTEST"/amend REWRITTEN_LIST="$DOTEST"/rewritten-list REWRITTEN_PENDING="$DOTEST"/rewritten-pending -GIT_CHERRY_PICK_HELP="\ -hint: after resolving the conflicts, mark the corrected paths -hint: with 'git add ' and run 'git rebase --continue'" +GIT_CHERRY_PICK_HELP="$RESOLVEMSG" export GIT_CHERRY_PICK_HELP warn () { -- 1.7.3.2.864.gbbb96