diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-21 19:27:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-21 19:27:13 -0700 |
commit | e3f080d1c1d091db97eb840de39a5245a3c82f3e (patch) | |
tree | 2d5821021b314217f92f1826b1c4100e809c8f82 /githooks.html | |
parent | 7692782cd994796eb7bd0bed592669c5090289bb (diff) | |
download | git-htmldocs-e3f080d1c1d091db97eb840de39a5245a3c82f3e.tar.gz |
Autogenerated HTML docs for v1.8.2.1-538-gad776
Diffstat (limited to 'githooks.html')
-rw-r--r-- | githooks.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/githooks.html b/githooks.html index bc81d4e2c..f7947c6e6 100644 --- a/githooks.html +++ b/githooks.html @@ -829,7 +829,7 @@ given); <code>template</code> (if a <code>-t</code> option was given or the configuration option <code>commit.template</code> is set); <code>merge</code> (if the
commit is a merge or a <code>.git/MERGE_MSG</code> file exists); <code>squash</code>
(if a <code>.git/SQUASH_MSG</code> file exists); or <code>commit</code>, followed by
-a commit SHA1 (if a <code>-c</code>, <code>-C</code> or <code>--amend</code> option was given).</p></div>
+a commit SHA-1 (if a <code>-c</code>, <code>-C</code> or <code>--amend</code> option was given).</p></div>
<div class="paragraph"><p>If the exit status is non-zero, <em>git commit</em> will abort.</p></div>
<div class="paragraph"><p>The purpose of the hook is to edit the message file in place, and
it is not suppressed by the <code>--no-verify</code> option. A non-zero exit
@@ -912,11 +912,11 @@ hook would receive a line like the following:</p></div> <div class="content">
<pre><code>refs/heads/master 67890 refs/heads/foreign 12345</code></pre>
</div></div>
-<div class="paragraph"><p>although the full, 40-character SHA1s would be supplied. If the foreign ref
-does not yet exist the <code><remote SHA1></code> will be 40 <code>0</code>. If a ref is to be
+<div class="paragraph"><p>although the full, 40-character SHA-1s would be supplied. If the foreign ref
+does not yet exist the <code><remote SHA-1></code> will be 40 <code>0</code>. If a ref is to be
deleted, the <code><local ref></code> will be supplied as <code>(delete)</code> and the <code><local
-SHA1></code> will be 40 <code>0</code>. If the local commit was specified by something other
-than a name which could be expanded (such as <code>HEAD~</code>, or a SHA1) it will be
+SHA-1></code> will be 40 <code>0</code>. If the local commit was specified by something other
+than a name which could be expanded (such as <code>HEAD~</code>, or a SHA-1) it will be
supplied as it was originally given.</p></div>
<div class="paragraph"><p>If this hook exits with a non-zero status, <em>git push</em> will abort without
pushing anything. Information about why the push is rejected may be sent
@@ -1096,7 +1096,7 @@ processed by rebase.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-19 16:06:22 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
|