Merge branch 'hv/submodule-update-nuke-submodules'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2012 22:20:08 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2012 22:20:08 +0000 (15:20 -0700)
commit72fd7d82d7ff84343f8958f8450e35b6aa6ea80b
tree55b30051eb9f480f81e40ff6d5e119bfe87b1f48
parent653111f99c6bfa3bb5effd61c138bf925f19fbdb
parent242f55f61252e610092e93f4b2daebba21cb8acf
Merge branch 'hv/submodule-update-nuke-submodules'

"git add" allows adding a regular file to the path where a submodule
used to exist, but "git update-index" does not allow an equivalent
operation to Porcelain writers.
builtin/update-index.c