diff options
| -rwxr-xr-x | 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 f94f057dff..0499f9edd2 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 () { |