summaryrefslogtreecommitdiffstats
path: root/git-config.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-23 12:02:11 -0800
committerJunio C Hamano <gitster@pobox.com>2020-11-23 12:02:11 -0800
commit60c374e55f9e2b2da4b8ad8296321c8b3ad06aa0 (patch)
tree59f3090b800f51c7a4911c00e26ac06d215d91f2 /git-config.html
parentb7676d5ada0941ade7ac9acb8ce985686b62b2ab (diff)
downloadgit-htmldocs-60c374e55f9e2b2da4b8ad8296321c8b3ad06aa0.tar.gz
Autogenerated HTML docs for v2.29.2-366-gb291b0
Diffstat (limited to 'git-config.html')
-rw-r--r--git-config.html20
1 files changed, 20 insertions, 0 deletions
diff --git a/git-config.html b/git-config.html
index b60800884..360436fcd 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4436,6 +4436,11 @@ diff.guitool
<div class="ulist"><ul>
<li>
<p>
+bc3
+</p>
+</li>
+<li>
+<p>
gvimdiff
</p>
</li>
@@ -5008,6 +5013,16 @@ format.outputDirectory
</p>
</dd>
<dt class="hdlist1">
+format.filenameMaxLength
+</dt>
+<dd>
+<p>
+ The maximum length of the output filenames generated by the
+ <code>format-patch</code> command; defaults to 64. Can be overridden
+ by the <code>--filename-max-length=&lt;n&gt;</code> command line option.
+</p>
+</dd>
+<dt class="hdlist1">
format.useAutoBase
</dt>
<dd>
@@ -7173,6 +7188,11 @@ merge.guitool
<div class="ulist"><ul>
<li>
<p>
+bc3
+</p>
+</li>
+<li>
+<p>
gvimdiff
</p>
</li>