diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:25:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:25:11 -0700 |
| commit | ae76cb90cb835f9df42e849206ab55a1e1e1eea3 (patch) | |
| tree | 020dfd2630734d221cc2894afef5cd51b6876c28 /git-rebase--interactive.sh | |
| parent | 7cc1e385a0b0caa27de714a6c7242b14bf023a65 (diff) | |
| parent | 997b688769f8d3ea539990ab53d6a44a46a2b2b4 (diff) | |
| download | git-ae76cb90cb835f9df42e849206ab55a1e1e1eea3.tar.gz | |
Merge branch 'jn/cherry-revert-message-clean-up'
* jn/cherry-revert-message-clean-up:
tests: fix syntax error in "Use advise() for hints" test
cherry-pick/revert: Use advise() for hints
cherry-pick/revert: Use error() for failure message
Introduce advise() to print hints
Eliminate “Finished cherry-pick/revert” message
t3508: add check_head_differs_from() helper function and use it
revert: improve success message by adding abbreviated commit sha1
revert: don't print "Finished one cherry-pick." if commit failed
revert: refactor commit code into a new run_git_commit() function
revert: report success when using option --strategy
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 4d14b077d2..eb2dff55f8 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -114,9 +114,9 @@ AUTOSQUASH= test "$(git config --bool rebase.autosquash)" = "true" && AUTOSQUASH=t NEVER_FF= -GIT_CHERRY_PICK_HELP=" After resolving the conflicts, -mark the corrected paths with 'git add <paths>', and -run 'git rebase --continue'" +GIT_CHERRY_PICK_HELP="\ +hint: after resolving the conflicts, mark the corrected paths +hint: with 'git add <paths>' and run 'git rebase --continue'" export GIT_CHERRY_PICK_HELP warn () { |