diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2010-08-05 10:49:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 09:11:50 -0700 |
| commit | be4f2b408e5a00d123a0ecb04b0c6c48be71dfa1 (patch) | |
| tree | 500bc5a6661108fe40347f0b1f38336977790f4e /Documentation/config.txt | |
| parent | 302ad7a9930a34413418b6436f96826070367647 (diff) | |
| download | git-be4f2b408e5a00d123a0ecb04b0c6c48be71dfa1.tar.gz git-be4f2b408e5a00d123a0ecb04b0c6c48be71dfa1.tar.xz | |
Add the 'diff.ignoreSubmodules' config setting
When you have a lot of submodules checked out, the time penalty to check
for dirty submodules can easily imply a multiplication of the total time
by the factor 20. This makes the difference between almost instantaneous
(< 2 seconds) and unbearably slow (> 50 seconds) here, since the disk
caches are constantly overloaded.
To this end, the submodule.*.ignore config option was introduced, but it
is per-submodule.
This commit introduces a global config setting to set a default
(porcelain) value for the --ignore-submodules option, keeping the
default at 'none'. It can be overridden by the submodule.*.ignore
setting and by the --ignore-submodules option.
Incidentally, this commit fixes an issue with the overriding logic:
multiple --ignore-submodules options would not clear the previously
set flags.
While at it, fix a typo in the documentation for submodule.*.ignore.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c88a63764..cf5562192 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -826,6 +826,11 @@ diff.renames:: will enable basic rename detection. If set to "copies" or "copy", it will detect copies, as well. +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'. + diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. @@ -1754,7 +1759,7 @@ submodule.<name>.ignore:: submodules that have untracked files in their work tree as changed. This setting overrides any setting made in .gitmodules for this submodule, both settings can be overriden on the command line by using the - "--ignore-submodule" option. + "--ignore-submodules" option. tar.umask:: This variable can be used to restrict the permission bits of |