Code

Merge branch 'nm/submodule-update-force'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:36 +0000 (15:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:36 +0000 (15:58 -0700)
commit0d405d72f5ffb499b40dd3a95886ae5a1fc13b30
tree5508dff285aa24e08475eae9b2d7380800881e45
parent2d23c64ba2e91029f4ce932117a1772378d63cf3
parent9db31bdf5c834689c826f809d6d15bf7ab8d3598
Merge branch 'nm/submodule-update-force'

* nm/submodule-update-force:
  submodule: Add --force option for git submodule update

Conflicts:
t/t7406-submodule-update.sh
Documentation/git-submodule.txt
git-submodule.sh
t/t7406-submodule-update.sh