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 /Documentation/gitmodules.txt | |
| parent | 436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1 (diff) | |
| parent | 329484256e0fe42676e93669122e7a5a007ef4ed (diff) | |
| download | git-7d40f89137b456820d51ebc1cbb3ffbb966e7fec.tar.gz | |
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 'Documentation/gitmodules.txt')
| -rw-r--r-- | Documentation/gitmodules.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index d1a17e2625..1b67f0a9f1 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -30,6 +30,15 @@ submodule.<name>.path:: submodule.<name>.url:: Defines an url from where the submodule repository can be cloned. +submodule.<name>.update:: + Defines what to do when the submodule is updated by the superproject. + If 'checkout' (the default), the new commit specified in the + superproject will be checked out in the submodule on a detached HEAD. + If 'rebase', the current branch of the submodule will be rebased onto + the commit specified in the superproject. + This config option is overridden if 'git submodule update' is given + the '--rebase' option. + EXAMPLES -------- |