From 787befdf14fd035c9d6faed5bd08b45d9e6a60a5 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 19 Sep 2013 15:23:17 +0200 Subject: add parent 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/using-git.texinfo b/using-git.texinfo index 25bef12..9e9ef78 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -2206,6 +2206,13 @@ objects. @c TODO @item pathspec @c @item path specification +@item parent +Logical predecessor. The commit from which +a new commit is made is called the new commit's +parent. A merge have two or more parents, and +the first commit, or the first commit in an +orphaned branched, has no parents. + @c TODO @item pickaxe @item plumbing -- cgit v1.2.3-70-g09d2