undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: commit-tree: remove 16 parents restriction

Browse Source 
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>
This commit is contained in:
Thomas Rast 2008-08-08 09:52:55 +02:00 committed by Junio C Hamano
parent 468386a956
commit b3bc97cba4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-commit-tree.txt
View File

@ -16,12 +16,12 @@ This is usually not what an end user wants to run directly. See
linkgit:git-commit[1] instead. linkgit:git-commit[1] instead.
Creates a new commit object based on the provided tree object and 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 emits the new commit object id on stdout.
it is considered to be an initial tree.
A commit object usually has 1 parent (a commit after a change) or up A commit object may have any number of parents. With exactly one
to 16 parents. More than one parent represents a merge of branches parent, it is an ordinary commit. Having more than one parent makes
that led to them. 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 While a tree represents a particular directory state of a working
directory, a commit represents that state in "time", and explains how directory, a commit represents that state in "time", and explains how