| commit | 287a8701f6fe263696e9c74a3a2020f4cfbf4239 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:50:03 +0000 (25 11:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:50:03 +0000 (25 11:50 -0700) | ||
| tree | 865da60d812e652adc675edf32ee2fda851d823d | treesnapshot (tar.gz zip) |
| parent | 1881d2b88c4b889dcb95782ad4bc5395808438e9 | commitdiff |
| parent | c215d3d2826c882feb819e5743287ec74d9ff693 | commitdiff |
Merge branch 'jl/status-added-submodule-is-never-ignored' into maint
"git status" (and "git commit") behaved as if changes in a modified
submodule are not there if submodule.*.ignore configuration is set,
which was misleading. The configuration is only to unclutter diff
output during the course of development, and should not to hide
changes in the "status" output to cause the users forget to commit
them.
* 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
"git status" (and "git commit") behaved as if changes in a modified
submodule are not there if submodule.*.ignore configuration is set,
which was misleading. The configuration is only to unclutter diff
output during the course of development, and should not to hide
changes in the "status" output to cause the users forget to commit
them.
* 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
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| builtin/commit.c | diff1 | diff2 | blobhistory |
| wt-status.c | diff1 | diff2 | blobhistory |