summaryrefslogtreecommitdiffstats
path: root/git-commit.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-19 14:26:17 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-19 14:26:17 -0700
commite1b28594a7acfaa493ca0cf32e7e970dc549527a (patch)
tree5e63878f0543693e0c35dc49d2b9a649ad32d720 /git-commit.html
parent93f23166221e56a0b4b044f9a8b0b53aa57bc9e4 (diff)
downloadgit-htmldocs-e1b28594a7acfaa493ca0cf32e7e970dc549527a.tar.gz
Autogenerated HTML docs for v2.4.1-217-g6c124
Diffstat (limited to 'git-commit.html')
-rw-r--r--git-commit.html13
1 files changed, 8 insertions, 5 deletions
diff --git a/git-commit.html b/git-commit.html
index e4842a6cc..d18538d78 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -1075,8 +1075,8 @@ strip
</dt>
<dd>
<p>
- Strip leading and trailing empty lines, trailing whitespace, and
- #commentary and collapse consecutive empty lines.
+ Strip leading and trailing empty lines, trailing whitespace,
+ commentary and collapse consecutive empty lines.
</p>
</dd>
<dt class="hdlist1">
@@ -1261,8 +1261,11 @@ configuration variable documented in <a href="git-config.html">git-config(1)</a>
<p>
Show unified diff between the HEAD commit and what
would be committed at the bottom of the commit message
- template. Note that this diff output doesn&#8217;t have its
- lines prefixed with <em>#</em>.
+ template to help the user describe the commit by reminding
+ what changes the commit has.
+ Note that this diff output doesn&#8217;t have its
+ lines prefixed with <em>#</em>. This diff will not be a part
+ of the commit message.
</p>
<div class="paragraph"><p>If specified twice, show in addition the unified diff between
what would be committed and the worktree files, i.e. the unstaged
@@ -1628,7 +1631,7 @@ information.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-03-23 14:31:16 PDT
+Last updated 2015-05-19 14:25:29 PDT
</div>
</div>
</body>