diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-11 03:37:51 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-15 19:12:08 -0700 |
| commit | 314eeb6e483350cc7ef0bee0498ff24a12346495 (patch) | |
| tree | 2411b1879f3099e75ac5a20af968770f77e6f144 /git-rebase--interactive.sh | |
| parent | 981ff5c37ae20687c98d98c8689d5e89016026d2 (diff) | |
| download | git-314eeb6e483350cc7ef0bee0498ff24a12346495.tar.gz | |
cherry-pick/revert: Use advise() for hints
When cherry-pick fails after picking a large series of commits, it can
be hard to pick out the error message and advice. Prefix the advice
with “hint: ” to help.
Before:
error: could not apply 7ab78c9... foo
After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:
git commit -c 7ab78c9a7898b87127365478431289cb98f8d98f
After:
error: could not apply 7ab78c9... foo
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit -c 7ab78c9'
Noticed-by: Thomas Rast <trast@student.ethz.ch>
Encouraged-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 31e68603f4..8f6876d301 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -113,9 +113,9 @@ REBASE_ROOT= AUTOSQUASH= 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 () { |