diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-13 16:40:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-13 16:40:39 -0700 |
| commit | 1b61cf8632a7ef3ee17701625cee277336d89162 (patch) | |
| tree | ef0b50fe7d3781f7254b5b0e7de6b03e0008a86a /git-pull.txt | |
| parent | 387ce23faf999558814034627e2b19817cec39a0 (diff) | |
| download | git-htmldocs-1b61cf8632a7ef3ee17701625cee277336d89162.tar.gz | |
Autogenerated HTML docs for v2.14.0-rc0
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-pull.txt b/git-pull.txt index 9db5e08f4..ce05b7a5b 100644 --- a/git-pull.txt +++ b/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 ~~~~~~~~~~~~~~~~~~~~~~~~~~ |