summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-25 18:50:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-25 18:50:03 (GMT)
commit287a8701f6fe263696e9c74a3a2020f4cfbf4239 (patch)
tree865da60d812e652adc675edf32ee2fda851d823d /GIT-VERSION-GEN
parent1881d2b88c4b889dcb95782ad4bc5395808438e9 (diff)
parentc215d3d2826c882feb819e5743287ec74d9ff693 (diff)
downloadgit-287a8701f6fe263696e9c74a3a2020f4cfbf4239.zip
git-287a8701f6fe263696e9c74a3a2020f4cfbf4239.tar.gz
git-287a8701f6fe263696e9c74a3a2020f4cfbf4239.tar.bz2
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
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions