| commit | d6a466e528119011d512379f7f9dfac26deb7fd9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Jun 2009 00:11:12 +0000 (13 17:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Jun 2009 00:11:12 +0000 (13 17:11 -0700) | ||
| tree | 2f173e69bbc47df4a7ff52d8e4f7fa654dad3e79 | treesnapshot (tar.gz zip) |
| parent | 85e52c0c82d390b193db4701985e838d423e7c4d | commitdiff |
| parent | 42b491786260eb17d97ea9fb1c4b70075bca9523 | commitdiff |
Merge branch 'ph/submodule-rebase' into next
* ph/submodule-rebase:
git-submodule: add support for --merge.
Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
* ph/submodule-rebase:
git-submodule: add support for --merge.
Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
| Documentation/git-submodule.txt | diff1 | diff2 | blobhistory |
| git-submodule.sh | diff1 | diff2 | blobhistory |