diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-02-08 00:49:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-02-08 00:49:45 +0000 |
| commit | e611683c24e33fcc90bfc93d80eba2d5c5622fc7 (patch) | |
| tree | 66c6815ac8d79adb77f72a4a3a74e2da2680925a /git-pull.txt | |
| parent | 103b5722e7729973bb843e748abe7d4c8f8f9a28 (diff) | |
| download | git-htmldocs-e611683c24e33fcc90bfc93d80eba2d5c5622fc7.tar.gz | |
Autogenerated HTML docs for v1.7.4-15-g7811
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-pull.txt b/git-pull.txt index 30466917d..b33e6be87 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -84,6 +84,15 @@ must be given before the options meant for 'git fetch'. --verbose:: Pass --verbose to git-fetch and git-merge. +--[no-]recurse-submodules:: + 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. + Options related to merging ~~~~~~~~~~~~~~~~~~~~~~~~~~ |