diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-21 15:49:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 15:49:01 -0700 |
| commit | 5e7f131ec750093b9c1691ff92db43b0595ea98c (patch) | |
| tree | 336c153c1aecfeab7cab7cf3502a7ffe0a6d7d6f /git-commit.html | |
| parent | 947ab826679af3ad71f1bd69391deca3bc6edad9 (diff) | |
| download | git-htmldocs-5e7f131ec750093b9c1691ff92db43b0595ea98c.tar.gz | |
Autogenerated HTML docs for v1.8.2-135-g7b592
Diffstat (limited to 'git-commit.html')
| -rw-r--r-- | git-commit.html | 56 |
1 files changed, 45 insertions, 11 deletions
diff --git a/git-commit.html b/git-commit.html index 3c86e478a..ac5302d8a 100644 --- a/git-commit.html +++ b/git-commit.html @@ -1059,17 +1059,51 @@ that, you can recover from it with <em>git reset</em>.</p></div> </dt>
<dd>
<p>
- This option sets how the commit message is cleaned up.
- The <em><mode></em> can be one of <em>verbatim</em>, <em>whitespace</em>, <em>strip</em>,
- and <em>default</em>. The <em>default</em> mode will strip leading and
- trailing empty lines and #commentary from the commit message
- only if the message is to be edited. Otherwise only whitespace
- removed. The <em>verbatim</em> mode does not change message at all,
- <em>whitespace</em> removes just leading/trailing whitespace lines
- and <em>strip</em> removes both whitespace and commentary. The default
- can be changed by the <em>commit.cleanup</em> configuration variable
- (see <a href="git-config.html">git-config(1)</a>).
+ This option determines how the supplied commit message should be
+ cleaned up before committing. The <em><mode></em> can be <code>strip</code>,
+ <code>whitespace</code>, <code>verbatim</code>, or <code>default</code>.
</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+strip
+</dt>
+<dd>
+<p>
+ Strip leading and trailing empty lines, trailing whitespace, and
+ #commentary and collapse consecutive empty lines.
+</p>
+</dd>
+<dt class="hdlist1">
+whitespace
+</dt>
+<dd>
+<p>
+ Same as <code>strip</code> except #commentary is not removed.
+</p>
+</dd>
+<dt class="hdlist1">
+verbatim
+</dt>
+<dd>
+<p>
+ Do not change the message at all.
+</p>
+</dd>
+<dt class="hdlist1">
+default
+</dt>
+<dd>
+<p>
+ Same as <code>strip</code> if the message is to be edited.
+ Otherwise <code>whitespace</code>.
+</p>
+</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>The default can be changed by the <em>commit.cleanup</em> configuration
+variable (see <a href="git-config.html">git-config(1)</a>).</p></div>
</dd>
<dt class="hdlist1">
-e
@@ -1564,7 +1598,7 @@ information.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-03-21 15:47:21 PDT
</div>
</div>
</body>
|