Merge branch 'ph/submodule-rebase'
* ph/submodule-rebase: git-submodule: add support for --merge. Conflicts: Documentation/git-submodule.txt git-submodule.sh
Junio C Hamano committed
Jun 20, 2009 at 21:51 UTC
a49eb197d809d2d7efbd81d935c61e1a0caa983e
No changes.