diff options
| author |  Jens Lehmann <Jens.Lehmann@web.de> | 2010-08-06 00:40:48 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-09 09:11:44 -0700 |
| commit | 302ad7a9930a34413418b6436f96826070367647 (patch) | |
| tree | 5cd126308137179d75632405e3c084950d8c4e34 /Documentation/config.txt | |
| parent | Submodules: Add the new "ignore" config option for diff and status (diff) | |
| download | tgif-302ad7a9930a34413418b6436f96826070367647.tar.xz | |
Submodules: Use "ignore" settings from .gitmodules too for diff and status
The .gitmodules file is parsed for "submodule.<name>.ignore" entries
before looking for them in .git/config. Thus settings found in .git/config
will override those from .gitmodules, thereby allowing the local developer
to ignore settings given by the remote side while also letting upstream
set defaults for those users who don't have special needs.
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.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5ca09aed90..c88a63764c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1752,6 +1752,9 @@ submodule.<name>.ignore:: let submodules with modified tracked files in their work tree show up. Using "none" (the default when this option is not set) also shows 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. tar.umask:: This variable can be used to restrict the permission bits of |