Merge branch 'hv/submodule-update-nuke-submodules' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:46:31 +0000 (12:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:46:31 +0000 (12:46 -0700)
"git add" allows adding a regular file to the path where a submodule
used to exist, but "git update-index" did not allow an equivalent
operation to Porcelain writers.

* hv/submodule-update-nuke-submodules:
update-index: allow overwriting existing submodule index entries

1  2 
builtin/update-index.c
Simple merge