]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 799beac 01d4721)
Merge branch 'sz/submodule-force-update'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 22:54:17 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 22:54:18 +0000 (15:54 -0700)
commit81dbbf72406c47b5199a59c6b83338b11fd3e754
tree271b241e1a83ceaa5de40eccad6c275a72126f0etree | snapshot
parent799beac15391004778186503bf198783960a82a3commit | diff
parent01d4721565f1562172149ebb91d29d6a7e7f922dcommit | diff
Merge branch 'sz/submodule-force-update'

"git submodule update --force" used to leave the working tree of the
submodule intact when there were local changes.  It is more intiutive
to make "--force" a sign to run "checkout -f" to overwrite them.

* sz/submodule-force-update:
  Make 'git submodule update --force' always check out submodules.
git-submodule.sh diff1 | diff2 | blob | history
t/t7406-submodule-update.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.