Skip to content

Commit

Permalink
Make <refname> documentation more consistent.
Browse files Browse the repository at this point in the history
Formerly, the documentation for <refname> would occasionally say
<name> instead of <refname>. Now it uniformly uses <refname>.

Signed-off-by: Max Horn <max@quendi.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Max Horn authored and Junio C Hamano committed Jul 6, 2012
1 parent 3b942e9 commit 89ce391
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Documentation/revisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ blobs contained in a commit.
object referenced by 'refs/heads/master'. If you
happen to have both 'heads/master' and 'tags/master', you can
explicitly say 'heads/master' to tell git which one you mean.
When ambiguous, a '<name>' is disambiguated by taking the
When ambiguous, a '<refname>' is disambiguated by taking the
first match in the following rules:

. If '$GIT_DIR/<name>' exists, that is what you mean (this is usually
. If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually
useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'
and 'CHERRY_PICK_HEAD');

. otherwise, 'refs/<name>' if it exists;
. otherwise, 'refs/<refname>' if it exists;

. otherwise, 'refs/tags/<refname>' if it exists;

. otherwise, 'refs/heads/<name>' if it exists;
. otherwise, 'refs/heads/<refname>' if it exists;

. otherwise, 'refs/remotes/<name>' if it exists;
. otherwise, 'refs/remotes/<refname>' if it exists;

. otherwise, 'refs/remotes/<name>/HEAD' if it exists.
. otherwise, 'refs/remotes/<refname>/HEAD' if it exists.
+
'HEAD' names the commit on which you based the changes in the working tree.
'FETCH_HEAD' records the branch which you fetched from a remote repository
Expand Down

0 comments on commit 89ce391

Please sign in to comment.