diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:56:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:56:02 -0700 |
| commit | 80ee1e04698d21d6d18e051a8d4d95b922a867f0 (patch) | |
| tree | 28e1fc87dfd2f7fd779b1cb71a912f883395902e | |
| parent | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' (diff) | |
| parent | am: indicate where a failed patch is to be found (diff) | |
| download | git-80ee1e04698d21d6d18e051a8d4d95b922a867f0.tar.gz git-80ee1e04698d21d6d18e051a8d4d95b922a867f0.zip | |
Merge branch 'pg/maint-1.7.9-am-where-is-patch'
When "git am" failed, old timers knew to check .git/rebase-apply/patch
to see what went wrong, but we never told the users about it.
* pg/maint-1.7.9-am-where-is-patch:
am: indicate where a failed patch is to be found
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rwxr-xr-x | git-am.sh | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7bc0e53848..a95e5a4ac9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -177,6 +177,9 @@ advice.*:: Advice shown when you used linkgit:git-checkout[1] to move to the detach HEAD state, to instruct how to create a local branch after the fact. + amWorkDir:: + Advice that shows the location of the patch file when + linkgit:git-am[1] fails to apply it. -- core.fileMode:: @@ -857,6 +857,11 @@ did you forget to use 'git add'?" if test $apply_status != 0 then eval_gettextln 'Patch failed at $msgnum $FIRSTLINE' + if test "$(git config --bool advice.amworkdir)" != false + then + eval_gettextln "The copy of the patch that failed is found in: + $dotest/patch" + fi stop_here_user_resolve $this fi |