Merge branch 'tr/void-diff-setup-done'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7bc0e5384871dc4c10df038cacee7c9d9370c4da..a95e5a4ac9a7e35623ada63d7919b193d7f86a6e 100644 (file)
--- 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::