Autogenerated HTML docs for v1.9.1-352-gd393d

1 files changed, 14 insertions, 2 deletions

diff --git a/git-commit.html b/git-commit.html
index 14ca56507..7fa15650a 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -1067,7 +1067,7 @@ that, you can recover from it with <em>git reset</em>.</p></div>
 <p>

         This option determines how the supplied commit message should be

         cleaned up before committing.  The <em>&lt;mode&gt;</em> can be <tt>strip</tt>,

-        <tt>whitespace</tt>, <tt>verbatim</tt>, or <tt>default</tt>.

+        <tt>whitespace</tt>, <tt>verbatim</tt>, <tt>scissors</tt> or <tt>default</tt>.

 </p>

 <div class="openblock">

 <div class="content">

@@ -1098,6 +1098,18 @@ verbatim
 </p>

 </dd>

 <dt class="hdlist1">

+scissors

+</dt>

+<dd>

+<p>

+        Same as <tt>whitespace</tt>, except that everything from (and

+        including) the line

+        "<tt># ------------------------ &gt;8 ------------------------</tt>"

+        is truncated if the message is to be edited. "<tt>#</tt>" can be

+        customized with core.commentChar.

+</p>

+</dd>

+<dt class="hdlist1">

 default

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-02-27 15:06:29 PST

+Last updated 2014-03-25 12:54:14 PDT

 </div>

 </div>

 </body>