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

diff --cc Documentation/config.txt
index cd2d6514e144d29e0eed5491e026f41d744162a3,2ecce0573586f953c6062ce759d6d2f98873b972..bdce52981dbcb12e6dfb82c175d2ca169b53a4be
--- 1/Documentation/config.txt
--- 2/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.<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
 +      the --ignore-submodules=dirty command-line option or the 'git
        submodule summary' command, which shows a similar output but does
        not honor these settings.
  

diff --cc builtin/commit.c
Simple merge

diff --cc t/t7508-status.sh
Simple merge

diff --cc wt-status.c
Simple merge