diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:37 -0700 |
| commit | e1165dd1442017c2b2722027168c497640f25746 (patch) | |
| tree | 6b1d95aa8cd3a213bfee6eee59de308da028068a /Documentation | |
| parent | c9eaaab4165d8f402930d12899ec097495b599e6 (diff) | |
| parent | 6ed7ddaadba9217b794aecf6d74a2e455daf7a96 (diff) | |
| download | git-e1165dd1442017c2b2722027168c497640f25746.tar.gz | |
Merge branch 'jl/maint-diff-ignore-submodules'
* jl/maint-diff-ignore-submodules:
t4027,4041: Use test -s to test for an empty file
Add optional parameters to the diff option "--ignore-submodules"
git diff: rename test that had a conflicting name
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index e745a3ccdc..2371262b10 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -328,8 +328,14 @@ endif::git-format-patch[] --no-ext-diff:: Disallow external diff drivers. ---ignore-submodules:: - Ignore changes to submodules in the diff generation. +--ignore-submodules[=<when>]:: + Ignore changes to submodules in the diff generation. <when> can be + either "untracked", "dirty" or "all", which is the default. 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, + only changes to the commits stored in the superproject are shown (this was + the behavior until 1.7.0). Using "all" hides all changes to submodules. --src-prefix=<prefix>:: Show the given source prefix instead of "a/". |