diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-17 23:09:55 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 23:09:55 +0300 |
commit | 28dbabb5e04d0d2bc714c46f24dfbf102089c15b (patch) | |
tree | 8aeebb44d9d14177a512e7b73532bb00865c3362 /Documentation | |
parent | 72c11b7e62c02d18a51f0bbaa2154ecebf8c74f0 (diff) | |
parent | 526608284a7600c5f0bcd6f5435ee680d79347ef (diff) |
Merge branch 'ab/fetch-nego'
Update to a few other topics around 'git fetch'.
* ab/fetch-nego:
fetch doc: cross-link two new negotiation options
negotiator: unknown fetch.negotiationAlgorithm should error out
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/config.txt | 5 | ||||
-rw-r--r-- | Documentation/fetch-options.txt | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c0eb78e344..b568bad15d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1550,9 +1550,12 @@ fetch.negotiationAlgorithm:: sent when negotiating the contents of the packfile to be sent by the server. Set to "skipping" to use an algorithm that skips commits in an effort to converge faster, but may result in a larger-than-necessary - packfile; any other value instructs Git to use the default algorithm + packfile; The default is "default" which instructs Git to use the default algorithm that never skips commits (unless the server has acknowledged it or one of its descendants). + Unknown values will cause 'git fetch' to error out. ++ +See also the `--negotiation-tip` option for linkgit:git-fetch[1]. format.attach:: Enable multipart/mixed attachments as the default for diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 2d09f87b4b..8bc36af4b1 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -57,6 +57,9 @@ commits reachable from any of the given commits. The argument to this option may be a glob on ref names, a ref, or the (possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying this option multiple times, one for each matching ref name. ++ +See also the `fetch.negotiationAlgorithm` configuration variable +documented in linkgit:git-config[1]. ifndef::git-pull[] --dry-run:: |