From 447693c919fdc5231efa12f146d22b42ba87e6a4 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 16 Sep 2013 17:02:05 +0200 Subject: add alternate and grafts to glossary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'using-git.texinfo') diff --git a/using-git.texinfo b/using-git.texinfo index de05df2..44643fc 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1716,7 +1716,10 @@ from all compiled files. @appendix Glossary @table @asis -@c TODO @item alternate object database +@item alternate object database +A repository can inherit part of its object +database from another object database, which +is called ``alternate''. @item bare repositry A bare repository is a repository without an @@ -1833,7 +1836,11 @@ do not want a backup repostory as it prevents you from accidentally remove anything but the working tree. -@c TODO @item grafts +@item grafts +Two different development lines can be +join together by recoding facke ancestry +information. This is configured via the +@file{.git/info/grafts} file. @item hash Especially if cryptographic, almost unique, -- cgit v1.2.3-70-g09d2