projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 436f66b 3294842)
Merge branch 'ph/submodule-rebase' (early part)
authorJunio C Hamano <gitster@pobox.com>
Sat, 13 Jun 2009 19:49:50 +0000 (12:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 13 Jun 2009 19:49:50 +0000 (12:49 -0700)
commit7d40f89137b456820d51ebc1cbb3ffbb966e7fec
tree7df8d4af9f00ed7ebb6023405db103a29a06f326tree | snapshot
parent436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1commit | diff
parent329484256e0fe42676e93669122e7a5a007ef4edcommit | 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
Documentation/git-submodule.txt diff1 | diff2 | blob | history
git-submodule.sh diff1 | diff2 | blob | history
Git—the stupid content tracker