diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-19 15:23:17 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-19 15:23:17 +0200 |
| commit | 787befdf14fd035c9d6faed5bd08b45d9e6a60a5 (patch) | |
| tree | bda891b21bc92dfed092e3e58df5dd9bfa3d513e /using-git.texinfo | |
| parent | add reflog to glossary (diff) | |
| download | using-git-787befdf14fd035c9d6faed5bd08b45d9e6a60a5.tar.gz using-git-787befdf14fd035c9d6faed5bd08b45d9e6a60a5.tar.bz2 using-git-787befdf14fd035c9d6faed5bd08b45d9e6a60a5.tar.xz | |
add parent to glossary
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -rw-r--r-- | using-git.texinfo | 7 |
1 files changed, 7 insertions, 0 deletions
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 |