Merge branch 'sb/gpg-i18n'

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 7c15bc0f534c77e435e466d529a1a71dc304bfa1..eb7ba84f1f65a316f3b1b3637983487b699a0a2c 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -149,6 +149,10 @@ to point at the new commit.
 [[def_git_archive]]Git archive::
        Synonym for <<def_repository,repository>> (for arch people).
 
+[[def_gitfile]]gitfile::
+       A plain file `.git` at the root of a working tree that
+       points at the directory that is the real repository.
+
 [[def_grafts]]grafts::
        Grafts enables two otherwise different lines of development to be joined
        together by recording fake ancestry information for commits. This way