diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-08-18 22:15:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-08-18 22:15:35 +0000 |
| commit | 619596afe5769620cfbaca941f701a3fa106e6e5 (patch) | |
| tree | a0065a9102205adf638a7ff9e35bb50ce049dcd0 /gitmodules.txt | |
| parent | b5a296fa6d8cd1a703ce2eb6232e0bbc654bd2a2 (diff) | |
| download | git-htmldocs-619596afe5769620cfbaca941f701a3fa106e6e5.tar.gz | |
Autogenerated HTML docs for v1.7.2.1-158-gbd3a97
Diffstat (limited to 'gitmodules.txt')
| -rw-r--r-- | gitmodules.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gitmodules.txt b/gitmodules.txt index 72a13d18e..8ae107da2 100644 --- a/gitmodules.txt +++ b/gitmodules.txt @@ -44,6 +44,21 @@ submodule.<name>.update:: This config option is overridden if 'git submodule update' is given the '--merge' or '--rebase' options. +submodule.<name>.ignore:: + Defines under what circumstances "git status" and the diff family show + a submodule as modified. When set to "all", it will never be considered + modified, "dirty" will ignore all changes to the submodules work tree and + takes only differences between the HEAD of the submodule and the commit + recorded in the superproject into account. "untracked" will additionally + 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. + If this option is also present in the submodules entry in .git/config of + the superproject, the setting there will override the one found in + .gitmodules. + Both settings can be overriden on the command line by using the + "--ignore-submodule" option. + EXAMPLES -------- |