Merge branch 'ph/submodule-rebase'
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:51:13 +0000 (21:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:51:13 +0000 (21:51 -0700)
* ph/submodule-rebase:
git-submodule: add support for --merge.

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

No differences found