git-submodule: add support for --merge.
authorJohan Herland <johan@herland.net>
Tue, 2 Jun 2009 22:59:12 +0000 (00:59 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jun 2009 07:09:16 +0000 (00:09 -0700)
commit42b4917...6260eb17d97ea9fb1c4b70075bca9523
tree3c33036...a9fdc6abf984c5497ae3c9668009cf10copy hash to clipboard (tree)
parent3294842...6e0fe42676e93669122e7a5a007ef4edcopy hash to clipboard (diff)
Documentation/git-submodule.txt
Documentation/gitmodules.txt
git-submodule.sh
t/t7406-submodule-update.sh