Autogenerated HTML docs for v2.14.0-rc0-40-g5eada

1 files changed, 13 insertions, 11 deletions

diff --git a/git-commit.html b/git-commit.html
index 68adffe76..97e884fe4 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -1109,12 +1109,14 @@ scissors
 </dt>

 <dd>

 <p>

-        Same as <code>whitespace</code>, except that everything from (and

-        including) the line

-        "<code># ------------------------ &gt;8 ------------------------</code>"

-        is truncated if the message is to be edited. "<code>#</code>" can be

-        customized with core.commentChar.

+        Same as <code>whitespace</code> except that everything from (and including)

+        the line found below is truncated, if the message is to be edited.

+        "<code>#</code>" can be customized with core.commentChar.

 </p>

+<div class="literalblock">

+<div class="content">

+<pre><code># ------------------------ &gt;8 ------------------------</code></pre>

+</div></div>

 </dd>

 <dt class="hdlist1">

 default

@@ -1570,10 +1572,10 @@ mind.</p></div>
 <div class="listingblock">

 <div class="content">

 <pre><code>[i18n]

-        commitencoding = ISO-8859-1</code></pre>

+        commitEncoding = ISO-8859-1</code></pre>

 </div></div>

 <div class="paragraph"><p>Commit objects created with the above setting record the value

-of <code>i18n.commitencoding</code> in its <code>encoding</code> header.  This is to

+of <code>i18n.commitEncoding</code> in its <code>encoding</code> header.  This is to

 help other people who look at them later.  Lack of this header

 implies that the commit log message is encoded in UTF-8.</p></div>

 </li>

@@ -1583,15 +1585,15 @@ implies that the commit log message is encoded in UTF-8.</p></div>
   <code>encoding</code> header of a commit object, and try to re-code the

   log message into UTF-8 unless otherwise specified.  You can

   specify the desired output encoding with

-  <code>i18n.logoutputencoding</code> in <code>.git/config</code> file, like this:

+  <code>i18n.logOutputEncoding</code> in <code>.git/config</code> file, like this:

 </p>

 <div class="listingblock">

 <div class="content">

 <pre><code>[i18n]

-        logoutputencoding = ISO-8859-1</code></pre>

+        logOutputEncoding = ISO-8859-1</code></pre>

 </div></div>

 <div class="paragraph"><p>If you do not have this configuration variable, the value of

-<code>i18n.commitencoding</code> is used instead.</p></div>

+<code>i18n.commitEncoding</code> is used instead.</p></div>

 </li>

 </ol></div>

 <div class="paragraph"><p>Note that we deliberately chose not to re-code the commit log

@@ -1656,7 +1658,7 @@ information.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-05-04 07:33:43 PDT

+Last updated 2017-07-21 15:42:15 PDT

 </div>

 </div>

 </body>