Documentation/glossary: describe "trailer"

Reported-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 42afe048691242c519850ba382dfc3b70a8f69d3..575c18f776efacc6d01db5e192481cda4afd919e 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -696,6 +696,11 @@ the `refs/tags/` hierarchy is used to represent local tags..
        that each contain very well defined concepts or small incremental yet
        related changes.
 
+[[def_trailer]]trailer::
+       Key-value metadata.  Trailers are optionally found at the end of
+       a commit message.  Might be called "footers" or "tags" in other
+       communities.  See linkgit:git-interpret-trailers[1].
+
 [[def_tree]]tree::
        Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree
        object>> together with the dependent <<def_blob_object,blob>> and tree objects