undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull: Document the "--[no-]recurse-submodules" options

Browse Source 
In commits be254a0ea9 and 7dce19d374 the handling of the new fetch options
"--[no-]recurse-submodules" had been added to git-pull.sh. But they were
not documented as the pull options they now are, so let's fix that.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jens Lehmann 2011-02-07 23:24:54 +01:00 committed by Junio C Hamano
parent cf548cacdd
commit 7811d9600f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/fetch-options.txt
View File

@ -64,13 +64,11 @@ ifndef::git-pull[]
downloaded. The default behavior for a remote may be downloaded. The default behavior for a remote may be
specified with the remote.<name>.tagopt setting. See specified with the remote.<name>.tagopt setting. See
linkgit:git-config[1]. linkgit:git-config[1].
endif::git-pull[]
--[no-]recurse-submodules:: --[no-]recurse-submodules::
This option controls if new commits of all populated submodules should This option controls if new commits of all populated submodules should
be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]). be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
ifndef::git-pull[]
--submodule-prefix=<path>:: --submodule-prefix=<path>::
Prepend <path> to paths printed in informative messages Prepend <path> to paths printed in informative messages
such as "Fetching submodule foo". This option is used such as "Fetching submodule foo". This option is used

9
Documentation/git-pull.txt
View File

@ -84,6 +84,15 @@ must be given before the options meant for 'git fetch'.
--verbose:: --verbose::
Pass --verbose to git-fetch and git-merge. 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 Options related to merging
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~