Code

cherry-pick/revert: Use advise() for hints
authorJonathan Nieder <jrnieder@gmail.com>
Wed, 11 Aug 2010 08:37:51 +0000 (03:37 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Aug 2010 02:12:08 +0000 (19:12 -0700)
commit314eeb6e483350cc7ef0bee0498ff24a12346495
tree2411b1879f3099e75ac5a20af968770f77e6f144
parent981ff5c37ae20687c98d98c8689d5e89016026d2
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>
builtin/revert.c
git-rebase--interactive.sh
t/t3507-cherry-pick-conflict.sh