From: Junio C Hamano Date: Mon, 16 Jun 2014 17:07:19 +0000 (-0700) Subject: Merge branch 'jl/status-added-submodule-is-never-ignored' X-Git-Tag: v2.1.0-rc0~121 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d681f0a3e1fd10d4f51df3a90af30f4de299f89?hp=--cc 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 --- 6d681f0a3e1fd10d4f51df3a90af30f4de299f89 diff --cc Documentation/config.txt index cd2d6514e1,2ecce05735..bdce52981d --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -2301,9 -2227,11 +2301,11 @@@ 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..ignore=all`. To + for those submodules where `submodule..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 + the --ignore-submodules=dirty command-line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings.