undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: show consistent conflict resolution hint

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin von Zweigbergk 2011-02-06 13:43:49 -05:00 committed by Junio C Hamano
parent 46df82d5fa
commit 89c7ae9c3b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--interactive.sh
View File

@ -81,9 +81,7 @@ amend="$dotest"/amend
rewritten_list="$dotest"/rewritten-list rewritten_list="$dotest"/rewritten-list
rewritten_pending="$dotest"/rewritten-pending rewritten_pending="$dotest"/rewritten-pending
GIT_CHERRY_PICK_HELP="\ GIT_CHERRY_PICK_HELP="$resolvemsg"
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' and run 'git rebase --continue'"
export GIT_CHERRY_PICK_HELP export GIT_CHERRY_PICK_HELP
warn () { warn () {