Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: commit-tree: remove 16 parents restriction
author
Thomas Rast
<trast@student.ethz.ch>
Fri, 8 Aug 2008 07:52:55 +0000
(09:52 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 8 Aug 2008 10:01:52 +0000
(
03:01
-0700)
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>
Documentation/git-commit-tree.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
468386a
)
diff --git
a/Documentation/git-commit-tree.txt
b/Documentation/git-commit-tree.txt
index feec58400b64c65c8f96f2d1834016455c89829e..92ab3ab4a80a71808ad19a80c82ecb6d032bdea9 100644
(file)
--- 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
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
While a tree represents a particular directory state of a working
directory, a commit represents that state in "time", and explains how