| commit | 2d83109aabbb8c660c27cbf03ec67cb88822639f | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Tue, 4 Aug 2015 13:51:38 +0000 (4 21:51 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Aug 2015 05:02:11 +0000 (4 22:02 -0700) | ||
| tree | ffe07a9d8752de63bc31355f44ecf8b9e2cd4305 | treesnapshot (tar.gz zip) |
| parent | 5d28cf78196acc454b4430b1efe3b5f9e55ae2e6 | commitdiff |
builtin-am: exit with user friendly message on failure
Since ced9456 (Give the user a hint for how to continue in the case that
git-am fails because it requires user intervention, 2006-05-02), git-am
prints additional information on how the user can re-invoke git-am to
resume patch application after resolving the failure. Re-implement this
through the die_user_resolve() function.
Since cc12005 (Make git rebase interactive help match documentation.,
2006-05-13), git-am supports the --resolvemsg option which is used by
git-rebase to override the message printed out when git-am fails.
Re-implement this option.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since ced9456 (Give the user a hint for how to continue in the case that
git-am fails because it requires user intervention, 2006-05-02), git-am
prints additional information on how the user can re-invoke git-am to
resume patch application after resolving the failure. Re-implement this
through the die_user_resolve() function.
Since cc12005 (Make git rebase interactive help match documentation.,
2006-05-13), git-am supports the --resolvemsg option which is used by
git-rebase to override the message printed out when git-am fails.
Re-implement this option.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/am.c | diffblobblamehistory |