Submodules: Use "ignore" settings from .gitmodules too for diff and status
commit3ea82c9f1cede89b6e30b1fe4202ad3c2278d03b
authorJens Lehmann <Jens.Lehmann@web.de>
Mon, 26 Jul 2010 18:28:31 +0000 (26 20:28 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 11 Aug 2010 13:47:28 +0000 (11 15:47 +0200)
treebc718b4c25fd3f044023eea0180d9fb63c882f08
parentb1a201bc560a858da9f6bf331a56de5bf382a1ea
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: Johannes Schindelin <johannes.schindelin@gmx.de>
13 files changed:
Documentation/config.txt
Documentation/diff-options.txt
Documentation/git-status.txt
Documentation/gitmodules.txt
builtin/commit.c
builtin/diff-files.c
builtin/diff-index.c
builtin/diff-tree.c
builtin/diff.c
submodule.c
submodule.h
t/t4027-diff-submodule.sh
t/t7508-status.sh