summaryrefslogtreecommitdiff
path: root/Documentation/glossary-content.txt
diff options
context:
space:
mode:
authorThomas Ackermann <th.acker@arcor.de>2013-02-01 18:11:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-01 21:53:33 (GMT)
commit19b4d3d4ff40c5418460fb61b0013713211b427b (patch)
treef5eddaf885f56d76c77207c82ff21aa67ac85ed5 /Documentation/glossary-content.txt
parent0859c969db9d1250cbdb14d34efa1d17209ff45b (diff)
downloadgit-19b4d3d4ff40c5418460fb61b0013713211b427b.zip
git-19b4d3d4ff40c5418460fb61b0013713211b427b.tar.gz
git-19b4d3d4ff40c5418460fb61b0013713211b427b.tar.bz2
Documentation: add a description for 'gitfile' to glossary
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/glossary-content.txt')
-rw-r--r--Documentation/glossary-content.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 7c15bc0..eb7ba84 100644
--- 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