aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-18 12:36:25 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-18 12:36:25 -0700
commitcc34bb0b0279a79117978cf220d70b1c14da05ca (patch)
tree83ea20e7109b8d96caf0aeed855656d03968f0df /Documentation/diff-options.txt
parent06d11b2e8d9d78d01212024f0f410e4193cbb5bd (diff)
parent90e14525f22c2980d4375dcb5d79e6d5da293a78 (diff)
downloadgit-cc34bb0b0279a79117978cf220d70b1c14da05ca.tar.gz
git-cc34bb0b0279a79117978cf220d70b1c14da05ca.tar.xz
Merge branch 'jl/submodule-ignore-diff'
* jl/submodule-ignore-diff: Add tests for the diff.ignoreSubmodules config option Add the 'diff.ignoreSubmodules' config setting Submodules: Use "ignore" settings from .gitmodules too for diff and status Submodules: Add the new "ignore" config option for diff and status Conflicts: diff.c
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index eecedaab6..4656a97e6 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -355,7 +355,11 @@ endif::git-format-patch[]
--ignore-submodules[=<when>]::
Ignore changes to submodules in the diff generation. <when> can be
- either "untracked", "dirty" or "all", which is the default. When
+ either "none", "untracked", "dirty" or "all", which is the default
+ Using "none" will consider the submodule modified when it either contains
+ untracked or modified files or its HEAD differs from the commit recorded
+ in the superproject and can be used to override any settings of the
+ 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When
"untracked" is used submodules are not considered dirty when they only
contain untracked content (but they are still scanned for modified
content). Using "dirty" ignores all changes to the work tree of submodules,