summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
authorLibravatar Stefan Zager <szager@google.com>2012-07-25 10:41:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-24 09:00:43 -0700
commit01d4721565f1562172149ebb91d29d6a7e7f922d (patch)
tree6ce6aaf48e78dc3de1a0983206a7eeb4370ad182 /t/t7606-merge-custom.sh
parentGit 1.7.11.3 (diff)
downloadtgif-01d4721565f1562172149ebb91d29d6a7e7f922d.tar.xz
Make 'git submodule update --force' always check out submodules.
Currently, it will only do a checkout if the sha1 registered in the containing repository doesn't match the HEAD of the submodule, regardless of whether the submodule is dirty. As discussed on the mailing list, the '--force' flag is a strong indicator that the state of the submodule is suspect, and should be reset to HEAD. Signed-off-by: Stefan Zager <szager@google.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions