summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/config.txt10
-rw-r--r--Documentation/config/stash.txt9
2 files changed, 10 insertions, 9 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5e9fc20c41..aedc73f4eb 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -415,15 +415,7 @@ include::config/ssh.txt[]
include::config/status.txt[]
-stash.showPatch::
- If this is set to true, the `git stash show` command without an
- option will show the stash entry 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 entry. Defaults to true.
- See description of 'show' command in linkgit:git-stash[1].
+include::config/stash.txt[]
include::submodule-config.txt[]
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt
new file mode 100644
index 0000000000..c583d46d6b
--- /dev/null
+++ b/Documentation/config/stash.txt
@@ -0,0 +1,9 @@
+stash.showPatch::
+ If this is set to true, the `git stash show` command without an
+ option will show the stash entry 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 entry. Defaults to true.
+ See description of 'show' command in linkgit:git-stash[1].