]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d212ca1) | patch
merge-recursive: do not die on a conflicting submodule
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 18:08:18 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 23:50:21 +0000 (16:50 -0700)
commit0c44c94309693d0582e91a6744edc2e8eba46ef8
tree478bfc7cd76c4c9432018ddc686eb121eb418c96tree | snapshot
parentd212ca1724b1a3708a3b4cb72c58b20ef442b24fcommit | diff
merge-recursive: do not die on a conflicting submodule

We cannot represent the 3-way conflicted state in the work tree
for these entries, but it is normal not to have commit objects
for them in our repository.  Just update the index and the life
will be good.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
t/t7405-submodule-merge.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.