summaryrefslogtreecommitdiff
path: root/Documentation/git-rev-parse.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-21 18:40:15 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-21 18:40:15 -0700
commitad77690fe400d91d3da97e16c07f1a8591b19b99 (patch)
tree6b6264e1b76b1afc438856473ca45ad052a99b0c /Documentation/git-rev-parse.txt
parentc6c4d616739b531b5689b78fbcb2c89d14e70a4f (diff)
parent57148ebb30fd7ed72acf7b3fc6f59d7cf2d94643 (diff)
downloadgit-ad77690fe400d91d3da97e16c07f1a8591b19b99.tar.gz
Merge branch 'ta/glossary'
* ta/glossary: glossary: improve definitions of refspec and pathspec The name of the hash function is "SHA-1", not "SHA1" glossary: improve description of SHA-1 related topics glossary: remove outdated/misleading/irrelevant entries
Diffstat (limited to 'Documentation/git-rev-parse.txt')
-rw-r--r--Documentation/git-rev-parse.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 1f9ed6cfd2..947d62fd25 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -95,7 +95,7 @@ can be used.
one.
--symbolic::
- Usually the object names are output in SHA1 form (with
+ Usually the object names are output in SHA-1 form (with
possible '{caret}' prefix); this option makes them output in a
form as close to the original input as possible.
@@ -180,7 +180,7 @@ print a message to stderr and exit with nonzero status.
--short::
--short=number::
- Instead of outputting the full SHA1 values of object names try to
+ Instead of outputting the full SHA-1 values of object names try to
abbreviate them to a shorter unique name. When no length is specified
7 is used. The minimum length is 4.