submodule: process conflicting submodules only once
authorNicolas Morey-Chaisemartin <nicolas.morey@free.fr>
Wed, 30 Mar 2011 05:20:02 +0000 (07:20 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 31 Mar 2011 00:34:08 +0000 (17:34 -0700)
commit313ee0d...9f58c2bf2f4e0a62b812c9d08a39b240
tree2c774c3...58f022aeb1285f0686dd3ec5f26469ebcopy hash to clipboard (tree)
parent806e0ab...2e5d976233703e6ff517af10329e4048copy hash to clipboard (diff)
Documentation/git-submodule.txt
git-submodule.sh
t/t7405-submodule-merge.sh