From ebea3d57aa28ce580ed86efe6d40302e3ca5a6d5 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Thu, 22 Aug 2013 17:17:19 +0200
Subject: glossary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 using-git.texinfo | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

(limited to 'using-git.texinfo')

diff --git a/using-git.texinfo b/using-git.texinfo
index 2f4f1dd..4092616 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -56,6 +56,7 @@ Texts. A copy of the license is included in the section entitled
 * Collaborating::
 * Basic commands::
 * I just don't know what went wrong::
+* Glossary::
 * GNU Free Documentation License::
 @end menu
 
@@ -1119,6 +1120,107 @@ bisection.
 
 
 
+@node Glossary
+@appendix Glossary
+
+@table @asis
+@item bare repositry
+A bare repository is a repository without an
+index tree or working tree. It just contains
+the commits. Because it just contains the
+commits it does not have a @file{.git} directory,
+but instread directly contains the content
+you would find in a @file{.git} directory.
+If is normally named with @file{.git} is a
+suffix.
+
+@item blob object
+Untyped object, for example, the contents of
+a file.
+
+@item branch
+Alternative parallel development line, normally
+indended the be merged with the branch it forked
+out of.
+
+@item cache
+Obsolete, replaced by ‘index’.
+
+@item checkout
+The action of changing branch.
+
+@item cherry-picking
+Creating a new commit from a subset of commits.
+
+@item clean
+A working tree is clean if has no changes
+relative to the current @code{HEAD}
+
+@c @item commit
+@c @item commit objcet
+
+@item core Git
+The fundamental tools of source code management.
+
+@c @item dangling object
+@c @item deatched HEAD
+@c @item directory
+@c @item dirty
+@c @item evel merge
+@c @item fast-forward
+@c @item fetch
+@c @item gitfile
+@c @item grafys
+@c @item hash
+@c @item head
+@c @item HEAD
+@c @item head ref
+@c @item hook
+@c @item index
+@c @item index entry
+@c @item merge
+@c @item object
+@c @item object database
+@c @item object identifier
+@c @item object name
+@c @item object type
+@c @item octopus
+@c @item origin
+@c @item pack
+@c @item pack index
+@c @item pathspec
+@c @item pickaxe
+@c @item plumbing
+@c @item porcelain
+@c @item pull
+@c @item push
+@c @item reachable
+@c @item rebase
+@c @item ref
+@c @item reflog
+@c @item refspec
+@c @item remote-tracking branch
+@c @item repository
+@c @item resolve
+@c @item revision
+@c @item rewind
+@c @item SHA-1
+@c @item shallow repository
+@c @item symref
+@c @item tag
+@c @item tag object
+@c @item topic branch
+@c @item tree
+@c @item tree object
+@c @item tree-ish
+@c @item unmerged index
+@c @item unreachable object
+@c @item upstream branch
+@c @item working tree
+@end table
+
+
+
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 @include fdl.texinfo
-- 
cgit v1.2.3-70-g09d2