summaryrefslogtreecommitdiff
path: root/Documentation/git-commit-tree.txt
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2008-08-08 07:52:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-08 10:01:52 (GMT)
commitb3bc97cba45e3b97243d31927fbf2343c21b6766 (patch)
tree4fa01d1fe2d8e73bf4c4b710de0aa8ae428e3431 /Documentation/git-commit-tree.txt
parent468386a956c09ff59dd2b8fd681e162b2e167392 (diff)
downloadgit-b3bc97cba45e3b97243d31927fbf2343c21b6766.zip
git-b3bc97cba45e3b97243d31927fbf2343c21b6766.tar.gz
git-b3bc97cba45e3b97243d31927fbf2343c21b6766.tar.bz2
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>
Diffstat (limited to 'Documentation/git-commit-tree.txt')
-rw-r--r--Documentation/git-commit-tree.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index feec584..92ab3ab 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -16,12 +16,12 @@ This is usually not what an end user wants to run directly. See
linkgit:git-commit[1] instead.
Creates a new commit object based on the provided tree object and
-emits the new commit object id on stdout. If no parent is given then
-it is considered to be an initial tree.
+emits the new commit object id on stdout.
-A commit object usually has 1 parent (a commit after a change) or up
-to 16 parents. More than one parent represents a merge of branches
-that led to them.
+A commit object may have any number of parents. With exactly one
+parent, it is an ordinary commit. Having more than one parent makes
+the commit a merge between several lines of history. Initial (root)
+commits have no parents.
While a tree represents a particular directory state of a working
directory, a commit represents that state in "time", and explains how