summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2010-08-28 16:49:25 +0200
committerJunio C Hamano <gitster@pobox.com>2010-08-30 00:37:30 -0700
commit62ed0096423b098f9736f5397edad8aa7bf50210 (patch)
tree7be53d34b8eb9f7728dcaff33b45f35dfc57bbc1 /Documentation/config.txt
parent175f6e59f6c74d5f8c80fe3a6678915cc5d35cb6 (diff)
downloadgit-62ed0096423b098f9736f5397edad8aa7bf50210.tar.gz
checkout: Add test for diff.ignoreSubmodules
While at it, document that checkout uses this flag too in the Documentation. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cf5562192d..01b7e0ae6c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -829,7 +829,8 @@ diff.renames::
diff.ignoreSubmodules::
Sets the default value of --ignore-submodules. Note that this
affects only 'git diff' Porcelain, and not lower level 'diff'
- commands such as 'git diff-files'.
+ commands such as 'git diff-files'. 'git checkout' also honors
+ this setting when reporting uncommitted changes.
diff.suppressBlankEmpty::
A boolean to inhibit the standard behavior of printing a space