aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/fetch-options.txt
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2011-03-06 23:12:58 +0100
committerJunio C Hamano <gitster@pobox.com>2011-03-09 13:10:35 -0800
commitc16c3e40b5908ecf28be12b1caf266c7ab8de3c6 (patch)
tree9ce602aebbccf20d66dd73d10b613d85bead1988 /Documentation/fetch-options.txt
parentbf42b384058ee2b34f587426d0788353ffa9012a (diff)
downloadgit-c16c3e40b5908ecf28be12b1caf266c7ab8de3c6.tar.gz
fetch/pull: Don't recurse into a submodule when commits are already present
When looking for submodules where new commits have been recorded in the superproject ignore those cases where the submodules commits are already present locally. This can happen e.g. when the submodule has been rewound to an earlier state. Then there is no need to fetch the submodule again as the commit recorded in the newly fetched superproject commit has already been fetched earlier into the submodule. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/fetch-options.txt')
-rw-r--r--Documentation/fetch-options.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index d2870280c7..39d326abc6 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -73,7 +73,8 @@ ifndef::git-pull[]
'yes', which is the default when this option is used without any
value. Use 'on-demand' to only recurse into a populated submodule
when the superproject retrieves a commit that updates the submodule's
- reference.
+ reference to a commit that isn't already in the local submodule
+ clone.
--no-recurse-submodules::
Disable recursive fetching of submodules (this has the same effect as