Make <refname> documentation more consistent.
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>
Max Horn committed
Jul 6, 2012 at 02:01 UTC
89ce391b8edae97bbfd0fdb33b4c252b6fd0dc53
1 file changed
+6
-6
Documentation/revisions.txt
+6
-6
@@ -24,22 +24,22 @@ blobs contained in a commit.
24
object referenced by 'refs/heads/master'. If you
25
happen to have both 'heads/master' and 'tags/master', you can
26
explicitly say 'heads/master' to tell git which one you mean.
27
- When ambiguous, a '<name>' is disambiguated by taking the
27
+ When ambiguous, a '<refname>' is disambiguated by taking the
28
first match in the following rules:
29
30
- . If '$GIT_DIR/<name>' exists, that is what you mean (this is usually
30
+ . If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually
31
useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'
32
and 'CHERRY_PICK_HEAD');
33
34
- . otherwise, 'refs/<name>' if it exists;
34
+ . otherwise, 'refs/<refname>' if it exists;
35
36
. otherwise, 'refs/tags/<refname>' if it exists;
37
38
- . otherwise, 'refs/heads/<name>' if it exists;
38
+ . otherwise, 'refs/heads/<refname>' if it exists;
39
40
- . otherwise, 'refs/remotes/<name>' if it exists;
40
+ . otherwise, 'refs/remotes/<refname>' if it exists;
41
42
- . otherwise, 'refs/remotes/<name>/HEAD' if it exists.
42
+ . otherwise, 'refs/remotes/<refname>/HEAD' if it exists.
43
+
44
'HEAD' names the commit on which you based the changes in the working tree.
45
'FETCH_HEAD' records the branch which you fetched from a remote repository