diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-04 08:17:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-04 08:17:09 -0700 |
| commit | 02377cf4bc6050cdbf600ce65114a5438b049763 (patch) | |
| tree | dbd54f78a83512f4f088e5799209ce730e77811f /Documentation/config.txt | |
| parent | a2c6726417db22bea7a878aeb88e18bcc95e5c0c (diff) | |
| parent | 23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f (diff) | |
| download | git-02377cf4bc6050cdbf600ce65114a5438b049763.tar.gz git-02377cf4bc6050cdbf600ce65114a5438b049763.tar.xz | |
Merge branch 'jl/submodule-ignore-diff'
* jl/submodule-ignore-diff:
checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
checkout: Add test for diff.ignoreSubmodules
checkout: respect diff.ignoreSubmodules setting
Conflicts:
builtin/checkout.c
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0510ac795..cda672101 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 |