diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:48 -0700 |
| commit | b2fc8226294e52c7f08533b202f2b90ce72b7eaf (patch) | |
| tree | 49f3d074e3ef48dcdc288a4524d0fda003ec0dc5 /Documentation/config | |
| parent | 368cab75c1e14c728b3767bad5ec6d46d6f29238 (diff) | |
| parent | eff40457a4ab4887c677453d11774322a494a98c (diff) | |
| download | git-b2fc8226294e52c7f08533b202f2b90ce72b7eaf.tar.xz | |
Merge branch 'ab/fetch-negotiate-segv-fix'
Code recently added to support common ancestry negotiation during
"git push" did not sanity check its arguments carefully enough.
* ab/fetch-negotiate-segv-fix:
fetch: fix segfault in --negotiate-only without --negotiation-tip=*
fetch: document the --negotiate-only option
send-pack.c: move "no refs in common" abort earlier
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/fetch.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt index 6af6f5edb2..63748c02b7 100644 --- a/Documentation/config/fetch.txt +++ b/Documentation/config/fetch.txt @@ -69,7 +69,8 @@ fetch.negotiationAlgorithm:: setting defaults to "skipping". Unknown values will cause 'git fetch' to error out. + -See also the `--negotiation-tip` option for linkgit:git-fetch[1]. +See also the `--negotiate-only` and `--negotiation-tip` options to +linkgit:git-fetch[1]. fetch.showForcedUpdates:: Set to false to enable `--no-show-forced-updates` in |