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 /Documentation | |
| parent | 15b3c82cbb345c890400119134fb9709790696d8 (diff) | |
| parent | 14bf2d58bc3b202da3ca34cfdf72392889135411 (diff) | |
| download | git-80ee1e04698d21d6d18e051a8d4d95b922a867f0.tar.gz git-80ee1e04698d21d6d18e051a8d4d95b922a867f0.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7bc0e5384..a95e5a4ac 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:: |