aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--using-git.texinfo7
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