diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-06-21 08:03:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-06-21 08:03:25 +0000 |
| commit | 0e88f3e399da078c8e389db57ca99569c3fdd3a8 (patch) | |
| tree | c7ec4e6fd1a6c15ab346f0f203e5cf804607cd68 /gitmodules.txt | |
| parent | f43de609d47d6cec7e8d5e363f372455f59a7ecd (diff) | |
| download | git-htmldocs-0e88f3e399da078c8e389db57ca99569c3fdd3a8.tar.gz | |
Autogenerated HTML docs for v1.6.3.2-363-gc5764
Diffstat (limited to 'gitmodules.txt')
| -rw-r--r-- | gitmodules.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gitmodules.txt b/gitmodules.txt index 1b67f0a9f..5daf750d1 100644 --- a/gitmodules.txt +++ b/gitmodules.txt @@ -35,9 +35,11 @@ submodule.<name>.update:: 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. + the commit specified in the superproject. If 'merge', the commit + specified in the superproject will be merged into the current branch + in the submodule. This config option is overridden if 'git submodule update' is given - the '--rebase' option. + the '--merge' or '--rebase' options. EXAMPLES |