| commit | 302ad7a9930a34413418b6436f96826070367647 | |
| author | Jens Lehmann <Jens.Lehmann@web.de> | |
| Thu, 5 Aug 2010 22:40:48 +0000 (6 00:40 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Aug 2010 16:11:44 +0000 (9 09:11 -0700) | ||
| tree | 5cd126308137179d75632405e3c084950d8c4e34 | treesnapshot (tar.gz zip) |
| parent | aee9c7d6540fe6f66fbbe7be420caa26ae0fa2d9 | commitdiff |
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>
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>
13 files changed: