summaryrefslogtreecommitdiffstats
path: root/git-config.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-03-19 15:19:03 -0700
committerJunio C Hamano <gitster@pobox.com>2023-03-19 15:19:03 -0700
commit3f5b4a7393b72902269bf06b5b94ede9fc5dee3d (patch)
treed81e84bc6cc8245d605e0fca11e849acb97f3374 /git-config.html
parent42ce67d67656af1241e4ef3aa4133991cccdafe6 (diff)
downloadgit-htmldocs-3f5b4a7393b72902269bf06b5b94ede9fc5dee3d.tar.gz
Autogenerated HTML docs for v2.40.0-115-ge25ca
Diffstat (limited to 'git-config.html')
-rw-r--r--git-config.html8
1 files changed, 8 insertions, 0 deletions
diff --git a/git-config.html b/git-config.html
index 864ac0fff..2fe8acb03 100644
--- a/git-config.html
+++ b/git-config.html
@@ -2320,6 +2320,14 @@ updateSparsePath
checkout.
</p>
</dd>
+<dt class="hdlist1">
+diverging
+</dt>
+<dd>
+<p>
+ Advice shown when a fast-forward is not possible.
+</p>
+</dd>
</dl></div>
</div></div>
</dd>