summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4.README
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-25 11:50:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-25 11:50:03 -0700
commit287a8701f6fe263696e9c74a3a2020f4cfbf4239 (patch)
tree865da60d812e652adc675edf32ee2fda851d823d /contrib/fast-import/git-p4.README
parentMerge branch 'ym/fix-opportunistic-index-update-race' into maint (diff)
parentcommit -m: commit staged submodules regardless of ignore config (diff)
downloadtgif-287a8701f6fe263696e9c74a3a2020f4cfbf4239.tar.xz
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 'contrib/fast-import/git-p4.README')
0 files changed, 0 insertions, 0 deletions