diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 11:32:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 11:32:37 -0700 |
| commit | 4b2a6c149b267a1120f1444a0951af13d7b36d69 (patch) | |
| tree | 5c68e72eebbfb448458790b8350ba417b3d93654 /githooks.html | |
| parent | 65314ca2cdc18a564335d61f615f5f6da04c0f97 (diff) | |
| download | git-htmldocs-4b2a6c149b267a1120f1444a0951af13d7b36d69.tar.gz | |
Autogenerated HTML docs for v2.14.1-248-gf0294f
Diffstat (limited to 'githooks.html')
| -rw-r--r-- | githooks.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/githooks.html b/githooks.html index 8dc8b7c6b..10b61e600 100644 --- a/githooks.html +++ b/githooks.html @@ -840,8 +840,8 @@ a commit SHA-1 (if a <code>-c</code>, <code>-C</code> or <code>--amend</code> op it is not suppressed by the <code>--no-verify</code> option. A non-zero exit
means a failure of the hook and aborts the commit. It should not
be used as replacement for pre-commit hook.</p></div>
-<div class="paragraph"><p>The sample <code>prepare-commit-msg</code> hook that comes with Git comments
-out the <code>Conflicts:</code> part of a merge’s commit message.</p></div>
+<div class="paragraph"><p>The sample <code>prepare-commit-msg</code> hook that comes with Git removes the
+help message found in the commented portion of the commit template.</p></div>
</div>
<div class="sect2">
<h3 id="_commit_msg">commit-msg</h3>
@@ -1154,7 +1154,7 @@ e-mails.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-05-29 21:14:02 PDT
+Last updated 2017-08-22 11:31:59 PDT
</div>
</div>
</body>
|