summaryrefslogtreecommitdiffstats
path: root/githooks.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-21 19:27:13 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-21 19:27:13 -0700
commite3f080d1c1d091db97eb840de39a5245a3c82f3e (patch)
tree2d5821021b314217f92f1826b1c4100e809c8f82 /githooks.txt
parent7692782cd994796eb7bd0bed592669c5090289bb (diff)
downloadgit-htmldocs-e3f080d1c1d091db97eb840de39a5245a3c82f3e.tar.gz
Autogenerated HTML docs for v1.8.2.1-538-gad776
Diffstat (limited to 'githooks.txt')
-rw-r--r--githooks.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/githooks.txt b/githooks.txt
index dc6693fe4..d48bf4d6f 100644
--- a/githooks.txt
+++ b/githooks.txt
@@ -99,7 +99,7 @@ given); `template` (if a `-t` option was given or the
configuration option `commit.template` is set); `merge` (if the
commit is a merge or a `.git/MERGE_MSG` file exists); `squash`
(if a `.git/SQUASH_MSG` file exists); or `commit`, followed by
-a commit SHA1 (if a `-c`, `-C` or `--amend` option was given).
+a commit SHA-1 (if a `-c`, `-C` or `--amend` option was given).
If the exit status is non-zero, 'git commit' will abort.
@@ -196,11 +196,11 @@ hook would receive a line like the following:
refs/heads/master 67890 refs/heads/foreign 12345
-although the full, 40-character SHA1s would be supplied. If the foreign ref
-does not yet exist the `<remote SHA1>` will be 40 `0`. If a ref is to be
+although the full, 40-character SHA-1s would be supplied. If the foreign ref
+does not yet exist the `<remote SHA-1>` will be 40 `0`. If a ref is to be
deleted, the `<local ref>` will be supplied as `(delete)` and the `<local
-SHA1>` will be 40 `0`. If the local commit was specified by something other
-than a name which could be expanded (such as `HEAD~`, or a SHA1) it will be
+SHA-1>` will be 40 `0`. If the local commit was specified by something other
+than a name which could be expanded (such as `HEAD~`, or a SHA-1) it will be
supplied as it was originally given.
If this hook exits with a non-zero status, 'git push' will abort without