user-manual: SHA1 -> object name
Prefer "object name" to SHA1, at least in higher level documentation. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
J. Bruce Fields committed
Jan 29, 2007 at 02:16 UTC
d55ae921ce33dc989b6b77317f25a5aa58d406fe
1 file changed
+5
-5
Documentation/user-manual.txt
+5
-5
@@ -692,7 +692,7 @@ Naming commits
692
693
We have seen several ways of naming commits already:
694
695
- - 40-hexdigit SHA1 id
695
+ - 40-hexdigit object name
696
- branch name: refers to the commit at the head of the given
697
branch
698
- tag name: refers to the commit pointed to by the given tag
@@ -705,7 +705,7 @@ gitlink:git-rev-parse[1] man page for the complete list of ways to
705
name revisions. Some examples:
706
707
-------------------------------------------------
708
-$ git show fb47ddb2 # the first few characters of the SHA1 id
708
+$ git show fb47ddb2 # the first few characters of the object name
709
# are usually enough to specify it uniquely
710
$ git show HEAD^ # the parent of the HEAD commit
711
$ git show HEAD^^ # the grandparent
@@ -743,8 +743,8 @@ which refers to the other branch that we're merging in to the current
743
branch.
744
745
The gitlink:git-rev-parse[1] command is a low-level command that is
746
-occasionally useful for translating some name for a commit to the SHA1 id for
747
-that commit:
746
+occasionally useful for translating some name for a commit to the object
747
+name for that commit:
748
749
-------------------------------------------------
750
$ git rev-parse origin
@@ -861,7 +861,7 @@ $ git diff origin..master
861
will tell you whether the contents of the project are the same at the
862
two branches; in theory, however, it's possible that the same project
863
contents could have been arrived at by two different historical
864
-routes. You could compare the SHA1 id's:
864
+routes. You could compare the object names:
865
866
-------------------------------------------------
867
$ git rev-list origin