| commit | a101eb41fb3319e5f0e2e12206cf2d87aab72f0f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Jul 2012 19:46:31 +0000 (11 12:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Jul 2012 19:46:31 +0000 (11 12:46 -0700) | ||
| tree | b41f01afa991e035069c4e239cb2e3063ea048bc | treesnapshot (tar.gz zip) |
| parent | 95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085 | commitdiff |
| parent | 242f55f61252e610092e93f4b2daebba21cb8acf | commitdiff |
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
"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
| builtin/update-index.c | diff1 | diff2 | blobhistory |