diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:49:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:49:50 -0700 |
| commit | 7d40f89137b456820d51ebc1cbb3ffbb966e7fec (patch) | |
| tree | 7df8d4af9f00ed7ebb6023405db103a29a06f326 /commit.c | |
| parent | Merge branch 'bc/solaris' (diff) | |
| parent | Rename submodule.<name>.rebase to submodule.<name>.update (diff) | |
| download | git-7d40f89137b456820d51ebc1cbb3ffbb966e7fec.tar.gz git-7d40f89137b456820d51ebc1cbb3ffbb966e7fec.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions