summaryrefslogtreecommitdiff
path: root/Documentation/revisions.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/revisions.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/revisions.txt')
-rw-r--r--Documentation/revisions.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 8855b1a0ac..a8ff691492 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -2,13 +2,13 @@ SPECIFYING REVISIONS
--------------------
A revision parameter '<rev>' typically, but not necessarily, names a
-commit object. It uses what is called an 'extended SHA1'
+commit object. It uses what is called an 'extended SHA-1'
syntax. Here are various ways to spell object names. The
ones listed near the end of this list name trees and
blobs contained in a commit.
'<sha1>', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::
- The full SHA1 object name (40-byte hexadecimal string), or
+ The full SHA-1 object name (40-byte hexadecimal string), or
a leading substring that is unique within the repository.
E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
name the same commit object if there is no other object in