Merge branch 'nk/stash-show-config'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0cc87a6f6565bbe794420bc47be8407e4ac47f22..e935cbdc0058ce0ff629237d0f928bf5b5815bb3 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2587,6 +2587,16 @@ status.submoduleSummary::
        submodule summary' command, which shows a similar output but does
        not honor these settings.
 
+stash.showPatch::
+       If this is set to true, the `git stash show` command without an
+       option will show the stash in patch form.  Defaults to false.
+       See description of 'show' command in linkgit:git-stash[1].
+
+stash.showStat::
+       If this is set to true, the `git stash show` command without an
+       option will show diffstat of the stash.  Defaults to true.
+       See description of 'show' command in linkgit:git-stash[1].
+
 submodule.<name>.path::
 submodule.<name>.url::
        The path within this project and URL for a submodule. These