From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 04:51:13 +0000 (-0700)
Subject: Merge branch 'ph/submodule-rebase'
X-Git-Tag: v1.6.4-rc0~44
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a49eb197d809d2d7efbd81d935c61e1a0caa983e?hp=a49eb197d809d2d7efbd81d935c61e1a0caa983e

Merge branch 'ph/submodule-rebase'

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

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