Merge branch 'ph/submodule-rebase'
commita49eb197d809d2d7efbd81d935c61e1a0caa983e
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:51:13 +0000 (20 21:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:51:13 +0000 (20 21:51 -0700)
tree06512c227fba59faaee57dcfe1ba71f049c4d0a7
parentc28a17f270a51a4ed5e432e83c0ed962361a37c9
parent42b491786260eb17d97ea9fb1c4b70075bca9523
Merge branch 'ph/submodule-rebase'

* ph/submodule-rebase:
  git-submodule: add support for --merge.

Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
Documentation/git-submodule.txt
git-submodule.sh