From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Jul 2012 19:46:31 +0000 (-0700)
Subject: Merge branch 'hv/submodule-update-nuke-submodules' into maint
X-Git-Tag: v1.7.11.2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a101eb41fb3319e5f0e2e12206cf2d87aab72f0f;p=git.git

Merge branch 'hv/submodule-update-nuke-submodules' into maint

"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
---

a101eb41fb3319e5f0e2e12206cf2d87aab72f0f