diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-13 16:14:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-13 16:14:54 -0700 |
| commit | c9c63ee558ce3399bd2016388da9676d4f5ecf55 (patch) | |
| tree | 6a799522833b916186424ff760e99818f3fe722c /Documentation | |
| parent | Merge branch 'sb/hashmap-customize-comparison' (diff) | |
| parent | builtin/fetch cleanup: always set default value for submodule recursing (diff) | |
| download | tgif-c9c63ee558ce3399bd2016388da9676d4f5ecf55.tar.xz | |
Merge branch 'sb/pull-rebase-submodule'
"git pull --rebase --recurse-submodules" learns to rebase the
branch in the submodules to an updated base.
* sb/pull-rebase-submodule:
builtin/fetch cleanup: always set default value for submodule recursing
pull: optionally rebase submodules (remote submodule changes only)
builtin/fetch: parse recurse-submodules-default at default options parsing
builtin/fetch: factor submodule recurse parsing out to submodule config
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 9db5e08f4a..ce05b7a5b1 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -86,12 +86,12 @@ OPTIONS --[no-]recurse-submodules[=yes|on-demand|no]:: This option controls if new commits of all populated submodules should - be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]). - That might be necessary to get the data needed for merging submodule - commits, a feature Git learned in 1.7.3. Notice that the result of a - merge will not be checked out in the submodule, "git submodule update" - has to be called afterwards to bring the work tree up to date with the - merge result. + be fetched and updated, too (see linkgit:git-config[1] and + linkgit:gitmodules[5]). ++ +If the checkout is done via rebase, local submodule commits are rebased as well. ++ +If the update is done via merge, the submodule conflicts are resolved and checked out. Options related to merging ~~~~~~~~~~~~~~~~~~~~~~~~~~ |