mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-24 09:27:19 +02:00
Code

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>
This commit is contained in:
J. Bruce Fields 2007-01-29 02:16:45 -05:00
parent 4a7979ca82
commit d55ae921ce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/user-manual.txt
View File

@ -692,7 +692,7 @@ Naming commits
We have seen several ways of naming commits already: We have seen several ways of naming commits already:
- 40-hexdigit SHA1 id - 40-hexdigit object name
- branch name: refers to the commit at the head of the given - branch name: refers to the commit at the head of the given
branch branch
- tag name: refers to the commit pointed to by the given tag - 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
name revisions. Some examples: name revisions. Some examples:
------------------------------------------------- -------------------------------------------------
$ git show fb47ddb2 # the first few characters of the SHA1 id $ git show fb47ddb2 # the first few characters of the object name
# are usually enough to specify it uniquely # are usually enough to specify it uniquely
$ git show HEAD^ # the parent of the HEAD commit $ git show HEAD^ # the parent of the HEAD commit
$ git show HEAD^^ # the grandparent $ git show HEAD^^ # the grandparent
@ -743,8 +743,8 @@ which refers to the other branch that we're merging in to the current
branch. branch.
The gitlink:git-rev-parse[1] command is a low-level command that is The gitlink:git-rev-parse[1] command is a low-level command that is
occasionally useful for translating some name for a commit to the SHA1 id for occasionally useful for translating some name for a commit to the object
that commit: name for that commit:
------------------------------------------------- -------------------------------------------------
$ git rev-parse origin $ git rev-parse origin
@ -861,7 +861,7 @@ $ git diff origin..master
will tell you whether the contents of the project are the same at the will tell you whether the contents of the project are the same at the
two branches; in theory, however, it's possible that the same project two branches; in theory, however, it's possible that the same project
contents could have been arrived at by two different historical contents could have been arrived at by two different historical
routes. You could compare the SHA1 id's: routes. You could compare the object names:
------------------------------------------------- -------------------------------------------------
$ git rev-list origin $ git rev-list origin