diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-09 14:20:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-09 14:20:59 -0800 |
| commit | 472a219f8daa522157886979ec954d4730755db1 (patch) | |
| tree | 2644011205730fe1e7990f436fe447835024cc45 /Documentation | |
| parent | Merge branch 'pw/add-p-hunk-split-fix' (diff) | |
| parent | fetch: help translators by reusing the same message template (diff) | |
| download | tgif-472a219f8daa522157886979ec954d4730755db1.tar.xz | |
Merge branch 'gc/fetch-negotiate-only-early-return'
"git fetch --negotiate-only" is an internal command used by "git
push" to figure out which part of our history is missing from the
other side. It should never recurse into submodules even when
fetch.recursesubmodules configuration variable is set, nor it
should trigger "gc". The code has been tightened up to ensure it
only does common ancestry discovery and nothing else.
* gc/fetch-negotiate-only-early-return:
fetch: help translators by reusing the same message template
fetch --negotiate-only: do not update submodules
fetch: skip tasks related to fetching objects
fetch: use goto cleanup in cmd_fetch()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fetch-options.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index e967ff1874..f903683189 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -71,6 +71,7 @@ configuration variables documented in linkgit:git-config[1], and the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server. + +This is incompatible with `--recurse-submodules=[yes|on-demand]`. Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]. |