summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-16 17:32:33 -0800
committerJunio C Hamano <gitster@pobox.com>2022-02-16 17:32:33 -0800
commitf1fc6ca2d27889be2f7829e15054bc8067ae9bc6 (patch)
tree3fb51df8e90ddd23c17c8a61a25df915ca6e7d73 /git-pull.html
parent0170485c457d7e861874a761fb76ee8de1a79d89 (diff)
downloadgit-htmldocs-f1fc6ca2d27889be2f7829e15054bc8067ae9bc6.tar.gz
Autogenerated HTML docs for v2.35.1-193-g45fe28
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html
index 27088f44b..743db2ce3 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1303,7 +1303,8 @@ configuration variables documented in <a href="git-config.html">git-config(1)</a
ancestors of the provided <code>--negotiation-tip=*</code> arguments,
which we have in common with the server.
</p>
-<div class="paragraph"><p>Internally this is used to implement the <code>push.negotiate</code> option, see
+<div class="paragraph"><p>This is incompatible with <code>--recurse-submodules=[yes|on-demand]</code>.
+Internally this is used to implement the <code>push.negotiate</code> option, see
<a href="git-config.html">git-config(1)</a>.</p></div>
</dd>
<dt class="hdlist1">