aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn <max@quendi.de>2012-07-06 02:01:29 +0200
committerJunio C Hamano <gitster@pobox.com>2012-07-05 23:59:30 -0700
commit89ce391b8edae97bbfd0fdb33b4c252b6fd0dc53 (patch)
tree11b5dbb21d0bfbe9a5459fee3ba5376d9dcaf250
parent3b942e9df7314f40d99e6aaa2c62070bb36024c5 (diff)
downloadgit-89ce391b8edae97bbfd0fdb33b4c252b6fd0dc53.tar.gz
git-89ce391b8edae97bbfd0fdb33b4c252b6fd0dc53.tar.xz
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>
-rw-r--r--Documentation/revisions.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 172566183..f4f6f281a 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -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