diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:07:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:07:19 -0700 |
| commit | 6d681f0a3e1fd10d4f51df3a90af30f4de299f89 (patch) | |
| tree | 7a75a1e154a3e5077a100199f07260a040c245b6 /Documentation/config.txt | |
| parent | 83a4904fad91c2de92140d344bee9912e89ee7d9 (diff) | |
| parent | c215d3d2826c882feb819e5743287ec74d9ff693 (diff) | |
| download | git-6d681f0a3e1fd10d4f51df3a90af30f4de299f89.tar.gz git-6d681f0a3e1fd10d4f51df3a90af30f4de299f89.tar.xz | |
Merge branch 'jl/status-added-submodule-is-never-ignored'
submodule.*.ignore and diff.ignoresubmodules are used to ignore all
submodule changes in "diff" output, but it can be confusing to
apply these configuration values to status and commit.
This is a backward-incompatible change, but should be so in a good
way (aka bugfix).
* jl/status-added-submodule-is-never-ignored:
commit -m: commit staged submodules regardless of ignore config
status/commit: show staged submodules regardless of ignore config
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index cd2d6514e..bdce52981 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2301,7 +2301,9 @@ status.submodulesummary:: --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 + for those submodules where `submodule.<name>.ignore=all`. The only + exception to that rule is that status and commit will show staged + submodule changes. 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 @@ -2332,7 +2334,9 @@ submodule.<name>.fetchRecurseSubmodules:: 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 + modified (but it will nonetheless show up in the output of status and + commit when it has been staged), "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. |