Documentation: commit-tree: remove 16 parents restriction
ef98c5ca lifted the 16 parents restriction in builtin-commit-tree.c, but forgot to update the documentation. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast committed
Aug 8, 2008 at 09:52 UTC
b3bc97cba45e3b97243d31927fbf2343c21b6766
1 file changed
+5
-5
Documentation/git-commit-tree.txt
+5
-5
@@ -16,12 +16,12 @@ This is usually not what an end user wants to run directly. See
16
linkgit:git-commit[1] instead.
17
18
Creates a new commit object based on the provided tree object and
19
-emits the new commit object id on stdout. If no parent is given then
20
-it is considered to be an initial tree.
19
+emits the new commit object id on stdout.
20
22
-A commit object usually has 1 parent (a commit after a change) or up
23
-to 16 parents. More than one parent represents a merge of branches
24
-that led to them.
21
+A commit object may have any number of parents. With exactly one
22
+parent, it is an ordinary commit. Having more than one parent makes
23
+the commit a merge between several lines of history. Initial (root)
24
+commits have no parents.
25
26
While a tree represents a particular directory state of a working
27
directory, a commit represents that state in "time", and explains how