summaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2006-11-18 19:44:08 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-18 22:04:51 (GMT)
commite3d457fb59f71dd40d24c82f48625a24492907d4 (patch)
treee7cd4daeb0d11655d52238fee848f538df2d98d7 /Documentation/glossary.txt
parentfd931411c0635ca5e7968bd2981457056b49062b (diff)
downloadgit-e3d457fb59f71dd40d24c82f48625a24492907d4.zip
git-e3d457fb59f71dd40d24c82f48625a24492907d4.tar.gz
git-e3d457fb59f71dd40d24c82f48625a24492907d4.tar.bz2
Documentation: Define symref and update HEAD description
HEAD was still described as a symlink instead of a symref. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/glossary.txt')
-rw-r--r--Documentation/glossary.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 7e560b0..894883d 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -282,6 +282,13 @@ SCM::
SHA1::
Synonym for object name.
+symref::
+ Symbolic reference: instead of containing the SHA1 id itself, it
+ is of the format 'ref: refs/some/thing' and when referenced, it
+ recursively dereferences to this reference. 'HEAD' is a prime
+ example of a symref. Symbolic references are manipulated with
+ the gitlink:git-symbolic-ref[1] command.
+
topic branch::
A regular git branch that is used by a developer to
identify a conceptual line of development. Since branches