Merge branch 'master' into js/merge

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 7e560b0eea83ae7b32e17095f766d84c0b67671f..894883d7b60c4c79263323fc007406c4f3720bac 100644 (file)
--- 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