| commit | 4d128884fbcce6c7effc729e1c52f06ce17037ee | |
| author | Jeff King <peff@peff.net> | |
| Thu, 11 Feb 2010 21:19:37 +0000 (11 16:19 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Feb 2010 06:11:12 +0000 (11 22:11 -0800) | ||
| tree | e2ce135772498dd408a106c20afe625c2680dac6 | treesnapshot (tar.gz zip) |
| parent | 97915544f84132b210a336d5877fafd7cb104abe | commitdiff |
cherry-pick: prettify the advice message
It's hard to see the "how to commit" part of this message,
which users may want to cut and paste. On top of that,
having it in paragraph form means that a really long commit
name may cause ugly wrapping. Let's make it prettier, like:
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:
git commit -c HEAD~23
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
It's hard to see the "how to commit" part of this message,
which users may want to cut and paste. On top of that,
having it in paragraph form means that a really long commit
name may cause ugly wrapping. Let's make it prettier, like:
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:
git commit -c HEAD~23
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-revert.c | diffblobblamehistory |