Andrew's git / gitweb.git / diff
?
Merge branch 'sz/submodule-force-update' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:17 +0000 (11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:17 +0000 (11:10 -0700)
* sz/submodule-force-update:
Make 'git submodule update --force' always check out submodules.

1  2 
git-submodule.sh patch | diff1 | diff2 | blob | history
t/t7406-submodule-update.sh patch | diff1 | diff2 | blob | history
diff --cc git-submodule.sh
Simple merge
diff --cc t/t7406-submodule-update.sh
Simple merge