diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-16 17:02:05 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-16 17:02:05 +0200 |
| commit | 447693c919fdc5231efa12f146d22b42ba87e6a4 (patch) | |
| tree | 4c31daf080b8e641040ece957f66f1bb59ecfe85 /using-git.texinfo | |
| parent | on build systems (diff) | |
| download | using-git-447693c919fdc5231efa12f146d22b42ba87e6a4.tar.gz using-git-447693c919fdc5231efa12f146d22b42ba87e6a4.tar.bz2 using-git-447693c919fdc5231efa12f146d22b42ba87e6a4.tar.xz | |
add alternate and grafts to glossary
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -rw-r--r-- | using-git.texinfo | 11 |
1 files changed, 9 insertions, 2 deletions
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, |