![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Jun 2009 19:49:50 +0000 (12:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Jun 2009 19:49:50 +0000 (12:49 -0700) | ||
| commit | 7d40f89137b456820d51ebc1cbb3ffbb966e7fec | |
| tree | 7df8d4af9f00ed7ebb6023405db103a29a06f326 | tree | snapshot |
| parent | 436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1 | commit | diff |
| parent | 329484256e0fe42676e93669122e7a5a007ef4ed | commit | diff |
Merge branch 'ph/submodule-rebase' (early part)
* 'ph/submodule-rebase' (early part):
Rename submodule.<name>.rebase to submodule.<name>.update
git-submodule: add support for --rebase.
Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
* 'ph/submodule-rebase' (early part):
Rename submodule.<name>.rebase to submodule.<name>.update
git-submodule: add support for --rebase.
Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
| Documentation/git-submodule.txt | diff1 | | diff2 | | blob | history |
| git-submodule.sh | diff1 | | diff2 | | blob | history |