[PATCH v2 20/31] rebase: show consistent conflict resolution hint
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Feb 6, 2011, 18:43 UTC
- Message-ID
- <1297017841-20678-21-git-send-email-martin.von.zweigbergk@gmail.com>
- In-Reply-To
- <1297017841-20678-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 <martin.von.zweigbergk@gmail.com> --- Should we include the "mark the corrected paths with 'git add <paths>'" 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 f94f057..0499f9e 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 <paths>' and run 'git rebase --continue'" +GIT_CHERRY_PICK_HELP="$resolvemsg" export GIT_CHERRY_PICK_HELP warn () {
-- 1.7.4.rc2.33.g8a14f