# [PATCH] Documentation: commit-tree: remove 16 parents restriction 3 messages from 2008-08-08 to 2008-08-08. Participants: Thomas Rast, Johannes Schindelin. Thread: https://gitlist.dev/t/14885 ## Thomas Rast, 2008-08-08 07:52 Subject: [PATCH] Documentation: commit-tree: remove 16 parents restriction Message-ID: <1218181975-12093-1-git-send-email-trast@student.ethz.ch> URL: https://gitlist.dev/e/1218181975-12093-1-git-send-email-trast%40student.ethz.ch ``` ef98c5ca lifted the 16 parents restriction in builtin-commit-tree.c, but forgot to update the documentation. Signed-off-by: Thomas Rast --- Documentation/git-commit-tree.txt | 10 +++++----- 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 -- 1.6.0.rc2.19.g3c9ba ``` ## Johannes Schindelin, 2008-08-08 10:38 Subject: Re: [PATCH] Documentation: commit-tree: remove 16 parents restriction Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0808081238250.9611%40pacific.mpi-cbg.de.mpi-cbg.de In-Reply-To: <1218181975-12093-1-git-send-email-trast@student.ethz.ch> ``` Hi, On Fri, 8 Aug 2008, Thomas Rast wrote: > ef98c5ca lifted the 16 parents restriction in builtin-commit-tree.c, > but forgot to update the documentation. > > Signed-off-by: Thomas Rast > --- > Documentation/git-commit-tree.txt | 10 +++++----- > 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. Oops. Ciao, Dscho ``` ## Thomas Rast, 2008-08-08 11:41 Subject: Re: [PATCH] Documentation: commit-tree: remove 16 parents restriction Message-ID: <200808081341.24451.trast@student.ethz.ch> URL: https://gitlist.dev/e/200808081341.24451.trast%40student.ethz.ch In-Reply-To: ``` Johannes Schindelin wrote: > > On Fri, 8 Aug 2008, Thomas Rast wrote: > > > 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. > > Oops. I deliberately removed that sentence because I wanted to enumerate all options in the new second paragraph (0, 1, or many), and felt it would be redundant. - Thomas -- Thomas Rast trast@student.ethz.ch ```