diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:45 -0700 |
| commit | 9f471e4b95d5f684dc9d0ec7c43ab267acc06ae4 (patch) | |
| tree | 2cdaaa3c0ceea88d63d3109fc046838ed9d3bba2 /Documentation | |
| parent | Merge branch 'js/walk-doc-optim' (diff) | |
| parent | pull: pass documented fetch options on (diff) | |
| download | tgif-9f471e4b95d5f684dc9d0ec7c43ab267acc06ae4.tar.xz | |
Merge branch 'rs/pull-options-sync-code-and-doc'
"git pull" shares many options with underlying "git fetch", but
some of them were not documented and some of those that would make
sense to pass down were not passed down.
* rs/pull-options-sync-code-and-doc:
pull: pass documented fetch options on
pull: remove --update-head-ok from documentation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fetch-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 00d03ec8c3..05709f67a1 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -204,7 +204,6 @@ ifndef::git-pull[] recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly. -endif::git-pull[] -u:: --update-head-ok:: @@ -214,6 +213,7 @@ endif::git-pull[] to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it. +endif::git-pull[] --upload-pack <upload-pack>:: When given, and the repository to fetch from is handled |