[WIP/PATCH 0/4] Re: Making error messages stand out
> On Thu, Jul 29, 2010 at 18:51, Jonathan Nieder <jrnieder@gmail.com> wrote:
Show 11 quoted lines
>> though, I find the best solution is to use short, formulaic messages:
>>
>> ...
>> Recorded resolution for 'dir/a'.
>> [detached HEAD aa9ae6b] related change
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>> fatal: could not apply 649420f... second
>> hint: after resolving the conflicts, mark the corrected paths
>> hint: with 'git add <paths>' and run 'git rebase --continue'
>
> Yes please. This would be _extremely_ helpful!
Ok. :)
This does not suppress the “Could not apply” message at the end yet.
Patches are against cc/revert.
Jonathan Nieder (4):
Eliminate “Finished cherry-pick/revert” message
Introduce advise() to print hints
cherry-pick: Use error() for failure message
cherry-pick: Use advise() for hints
Documentation/howto/revert-branch-rebase.txt | 6 ---
builtin/revert.c | 52 ++++++++++++-------------
contrib/examples/git-revert.sh | 1 -
git-rebase--interactive.sh | 6 +-
t/t3507-cherry-pick-conflict.sh | 20 ++++++++++
t/t3508-cherry-pick-many-commits.sh | 42 +++++++++++++++------
6 files changed, 78 insertions(+), 49 deletions(-)
Jonathan Nieder <jrnieder@gmail.com>