diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2011-03-06 23:14:15 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 13:10:36 -0800 |
| commit | 794a3592ad9d8a9b273f6496052bbcb46b1924ed (patch) | |
| tree | 1b26e6f07bef22d7e38b89f66baa28c850f2ee4b | |
| parent | e5f522d610d34914e3fcf8b23de1b771c467196e (diff) | |
| download | git-794a3592ad9d8a9b273f6496052bbcb46b1924ed.tar.gz git-794a3592ad9d8a9b273f6496052bbcb46b1924ed.tar.xz | |
fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
Using the --recurse-submodules option with fetch and pull might not always
fetch all the submodule commits the user expects, as this will only work
when the submodule is already checked out. Document that and warn that
this is expected to change in the future.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-fetch.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index c76e31392..86692276b 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -76,6 +76,15 @@ The `pu` branch will be updated even if it is does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be. +BUGS +---- +Using --recurse-submodules can only fetch new commits in already checked +out submodules right now. When e.g. upstream added a new submodule in the +just fetched commits of the superproject the submodule itself can not be +fetched, making it impossible to check out that submodule later without +having to do a fetch again. This is expected to be fixed in a future git +version. + SEE ALSO -------- linkgit:git-pull[1] diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c45efb37f..1aad8bfc5 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -220,6 +220,15 @@ If you tried a pull which resulted in a complex conflicts and would want to start over, you can recover with 'git reset'. +BUGS +---- +Using --recurse-submodules can only fetch new commits in already checked +out submodules right now. When e.g. upstream added a new submodule in the +just fetched commits of the superproject the submodule itself can not be +fetched, making it impossible to check out that submodule later without +having to do a fetch again. This is expected to be fixed in a future git +version. + SEE ALSO -------- linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1] |