1 files changed, 35 insertions, 1 deletions
diff --git a/git-config.html b/git-config.html
index 542229b30..3c638629a 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4903,7 +4903,7 @@ diff.mnemonicPrefix
 </dl></div>
 </dd>
 <dt class="hdlist1">
-diff.noprefix
+diff.noPrefix
 </dt>
 <dd>
 <p>
@@ -4911,6 +4911,22 @@ diff.noprefix
 </p>
 </dd>
 <dt class="hdlist1">
+diff.srcPrefix
+</dt>
+<dd>
+<p>
+        If set, <em>git diff</em> uses this source prefix. Defaults to "a/".
+</p>
+</dd>
+<dt class="hdlist1">
+diff.dstPrefix
+</dt>
+<dd>
+<p>
+        If set, <em>git diff</em> uses this destination prefix. Defaults to "b/".
+</p>
+</dd>
+<dt class="hdlist1">
 diff.relative
 </dt>
 <dd>
@@ -5423,6 +5439,22 @@ extensions.objectFormat
 work and will produce hard-to-diagnose issues.</p></div>
 </dd>
 <dt class="hdlist1">
+extensions.compatObjectFormat
+</dt>
+<dd>
+<p>
+        Specify a compatitbility hash algorithm to use.  The acceptable values
+        are <code>sha1</code> and <code>sha256</code>.  The value specified must be different from the
+        value of extensions.objectFormat.  This allows client level
+        interoperability between git repositories whose objectFormat matches
+        this compatObjectFormat.  In particular when fully implemented the
+        pushes and pulls from a repository in whose objectFormat matches
+        compatObjectFormat.  As well as being able to use oids encoded in
+        compatObjectFormat in addition to oids encoded with objectFormat to
+        locally specify objects.
+</p>
+</dd>
+<dt class="hdlist1">
 extensions.refStorage
 </dt>
 <dd>
@@ -10982,6 +11014,8 @@ status.showUntrackedFiles
 </ul></div>
 </div></div>
 <div class="paragraph"><p>If this variable is not specified, it defaults to <em>normal</em>.
+All usual spellings for Boolean value <code>true</code> are taken as <code>normal</code>
+and <code>false</code> as <code>no</code>.
 This variable can be overridden with the -u|--untracked-files option
 of <a href="git-status.html">git-status(1)</a> and <a href="git-commit.html">git-commit(1)</a>.</p></div>
 </dd>