diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2011-02-07 23:24:54 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-07 15:19:09 -0800 |
| commit | 7811d9600f02e70c9f835719c71156c967a684f7 (patch) | |
| tree | 9c939e87bcd4abafc242c5b4960d3a969b0b3a2f | |
| parent | cf548cacdd0c553b6524969d0d3fd5e787efeb3c (diff) | |
| download | git-7811d9600f02e70c9f835719c71156c967a684f7.tar.gz git-7811d9600f02e70c9f835719c71156c967a684f7.tar.xz | |
pull: Document the "--[no-]recurse-submodules" options
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>
| -rw-r--r-- | Documentation/fetch-options.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 695696da1..f37276e5a 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -64,13 +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]). -ifndef::git-pull[] --submodule-prefix=<path>:: Prepend <path> to paths printed in informative messages such as "Fetching submodule foo". This option is used diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 30466917d..b33e6be87 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~ |