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@xxxxxx> --- Am 07.02.2011 08:41, schrieb Jonathan Nieder: > Jens Lehmann wrote: >> --- a/Documentation/git-pull.txt >> +++ b/Documentation/git-pull.txt >> @@ -84,6 +84,10 @@ 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]). >> + > > Is it worth mentioning that this does not (yet) automatically check > out the new commits in submodules after a merge, or would such > documentation be too likely to be forgotten and left stale in the > future? Good point, here is v2! (And I will add an updated description to the relevant commits in my github repo, so we won't forget that later) Documentation/fetch-options.txt | 2 +- Documentation/git-pull.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 695696d..ab0dbfc 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -64,11 +64,11 @@ ifndef::git-pull[] downloaded. The default behavior for a remote may be specified with the remote.<name>.tagopt setting. See linkgit:git-config[1]. -endif::git-pull[] --[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]). +endif::git-pull[] ifndef::git-pull[] --submodule-prefix=<path>:: diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 3046691..b33e6be 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/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 ~~~~~~~~~~~~~~~~~~~~~~~~~~ -- 1.7.4.47.g87a200 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html