projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 653111f 242f55f)
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)
"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.

1  2 
builtin/update-index.c patch | diff1 | diff2 | blob | history

diff --cc builtin/update-index.c
Simple merge
Git—the stupid content tracker