[PATCH/RFC 20/20] rebase: show consistent conflict resolution hint
From: Martin von Zweigbergk <hidden>
Date: 2016-06-15 22:50:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 latter message for both types of rebase. Signed-off-by: Martin von Zweigbergk <redacted> --- 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 d60977d..b810197 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh@@ -82,9 +82,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 <paths>' and run 'git rebase --continue'" +GIT_CHERRY_PICK_HELP="$RESOLVEMSG" export GIT_CHERRY_PICK_HELP warn () {
--
1.7.3.2.864.gbbb96