diff options
author | Thomas Ackermann <th.acker@arcor.de> | 2013-02-01 19:11:24 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-01 13:53:33 -0800 |
commit | 19b4d3d4ff40c5418460fb61b0013713211b427b (patch) | |
tree | f5eddaf885f56d76c77207c82ff21aa67ac85ed5 /Documentation/glossary-content.txt | |
parent | 0859c969db9d1250cbdb14d34efa1d17209ff45b (diff) | |
download | git-19b4d3d4ff40c5418460fb61b0013713211b427b.tar.gz |
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.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 7c15bc0f53..eb7ba84f1f 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 |