Merge branch 'ls/p4-test-updates'

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 375213fe463fa3cd9cb7644cff60ee656c13dcd8..92df596e5fe9757fee399078e05e3ba44196fda3 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -95,6 +95,8 @@ show [<stash>]::
        shows the latest one. By default, the command shows the diffstat, but
        it will accept any format known to 'git diff' (e.g., `git stash show
        -p stash@{1}` to view the second most recent stash in patch form).
+       You can use stash.showStat and/or stash.showPatch config variables
+       to change the default behavior.
 
 pop [--index] [-q|--quiet] [<stash>]::