summaryrefslogtreecommitdiffstats
path: root/git-config.html
diff options
context:
space:
mode:
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>