diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:51:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:51:13 -0700 |
commit | a49eb197d809d2d7efbd81d935c61e1a0caa983e (patch) | |
tree | 06512c227fba59faaee57dcfe1ba71f049c4d0a7 /Documentation/gitmodules.txt | |
parent | Merge branch 'jc/cache-tree' (diff) | |
parent | git-submodule: add support for --merge. (diff) | |
download | tgif-a49eb197d809d2d7efbd81d935c61e1a0caa983e.tar.xz |
Merge branch 'ph/submodule-rebase'
* ph/submodule-rebase:
git-submodule: add support for --merge.
Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
Diffstat (limited to 'Documentation/gitmodules.txt')
-rw-r--r-- | Documentation/gitmodules.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 1b67f0a9f1..5daf750d19 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/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 |