Merge branch 'nd/index-errno' into maint-1.7.11

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 915cb5a547896966377e9f39059527e3142b27c8..b49feb582ef6c780a9dd1831bcd7e013e774b7c6 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -176,6 +176,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::