diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-01 14:44:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-01 14:44:24 -0700 |
commit | 3503b8d0da61d920ebd9294fd6a9a0f758328fd3 (patch) | |
tree | 5c01cf6a4f85971bd016764a6772fcfc0c4232d7 /Documentation/git.txt | |
parent | 62607e481391d1c2a76ba36fb24e4ec83403395a (diff) | |
parent | 67393c5dc99eb61e76d2ea4df3dae49e8e93828d (diff) | |
download | git-3503b8d0da61d920ebd9294fd6a9a0f758328fd3.tar.gz git-3503b8d0da61d920ebd9294fd6a9a0f758328fd3.tar.xz |
Merge branch 'nk/ref-doc' into maint
* nk/ref-doc:
glossary: clarify description of HEAD
glossary: update description of head and ref
glossary: update description of "tag"
git.txt: de-emphasize the implementation detail of a ref
check-ref-format doc: de-emphasize the implementation detail of a ref
git-remote.txt: avoid sounding as if loose refs are the only ones in the world
git-remote.txt: fix wrong remote refspec
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r-- | Documentation/git.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 3c7a83234..0172cd701 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -523,16 +523,15 @@ Any git command accepting any <object> can also use the following symbolic notation: HEAD:: - indicates the head of the current branch (i.e. the - contents of `$GIT_DIR/HEAD`). + indicates the head of the current branch. <tag>:: a valid tag 'name' - (i.e. the contents of `$GIT_DIR/refs/tags/<tag>`). + (i.e. a `refs/tags/<tag>` reference). <head>:: a valid head 'name' - (i.e. the contents of `$GIT_DIR/refs/heads/<head>`). + (i.e. a `refs/heads/<head>` reference). For a more complete list of ways to spell object names, see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. |