diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:36:08 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:36:08 -0700 |
| commit | 5636a20070c80dec23cc6d6180cb1dd958e23bca (patch) | |
| tree | 78ae41beca656e291696a58addf5a597b2d42018 /Documentation/config.txt | |
| parent | 80f165a58a41ffd37ec24022db8e568bc5165075 (diff) | |
| parent | bb58b696c6ad810560d361b640580715a90382cb (diff) | |
| download | git-5636a20070c80dec23cc6d6180cb1dd958e23bca.tar.gz git-5636a20070c80dec23cc6d6180cb1dd958e23bca.tar.xz | |
Merge branch 'bc/submodule-status-ignored'
* bc/submodule-status-ignored:
Improve documentation concerning the status.submodulesummary setting
submodule: don't print status output with ignore=all
submodule: fix confusing variable name
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c3f70023e..aaae06fc5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2214,7 +2214,14 @@ status.submodulesummary:: If this is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see - --summary-limit option of linkgit:git-submodule[1]). + --summary-limit option of linkgit:git-submodule[1]). Please note + that the summary output command will be suppressed for all + submodules when `diff.ignoreSubmodules` is set to 'all' or only + for those submodules where `submodule.<name>.ignore=all`. To + also view the summary for ignored submodules you can either use + the --ignore-submodules=dirty command line option or the 'git + submodule summary' command, which shows a similar output but does + not honor these settings. submodule.<name>.path:: submodule.<name>.url:: @@ -2249,7 +2256,8 @@ 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 overridden on the command line by using the - "--ignore-submodules" option. + "--ignore-submodules" option. The 'git submodule' commands are not + affected by this setting. tar.umask:: This variable can be used to restrict the permission bits of |