{"thread":{"id":"14885","subject":"[PATCH] Documentation: commit-tree: remove 16 parents restriction","startedAt":"2008-08-08T07:52:55Z","lastAt":"2008-08-08T11:41:22Z","messageCount":3,"participants":["Thomas Rast","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"86462","messageId":"1218181975-12093-1-git-send-email-trast@student.ethz.ch","threadId":"14885","inReplyTo":null,"subject":"[PATCH] Documentation: commit-tree: remove 16 parents restriction","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2008-08-08T07:52:55Z","receivedAt":"2008-08-08T07:52:55Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"ef98c5ca lifted the 16 parents restriction in builtin-commit-tree.c,\nbut forgot to update the documentation.\n\nSigned-off-by: Thomas Rast <trast@student.ethz.ch>\n---\n Documentation/git-commit-tree.txt |   10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\nindex feec584..92ab3ab 100644\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -16,12 +16,12 @@ This is usually not what an end user wants to run directly.  See\n linkgit:git-commit[1] instead.\n \n Creates a new commit object based on the provided tree object and\n-emits the new commit object id on stdout. If no parent is given then\n-it is considered to be an initial tree.\n+emits the new commit object id on stdout.\n \n-A commit object usually has 1 parent (a commit after a change) or up\n-to 16 parents.  More than one parent represents a merge of branches\n-that led to them.\n+A commit object may have any number of parents. With exactly one\n+parent, it is an ordinary commit. Having more than one parent makes\n+the commit a merge between several lines of history. Initial (root)\n+commits have no parents.\n \n While a tree represents a particular directory state of a working\n directory, a commit represents that state in \"time\", and explains how\n-- \n1.6.0.rc2.19.g3c9ba\n"},{"id":"86484","messageId":"alpine.DEB.1.00.0808081238250.9611@pacific.mpi-cbg.de.mpi-cbg.de","threadId":"14885","inReplyTo":"1218181975-12093-1-git-send-email-trast@student.ethz.ch","subject":"Re: [PATCH] Documentation: commit-tree: remove 16 parents restriction","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-08-08T10:38:46Z","receivedAt":"2008-08-08T10:38:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 8 Aug 2008, Thomas Rast wrote:\n\n> ef98c5ca lifted the 16 parents restriction in builtin-commit-tree.c,\n> but forgot to update the documentation.\n> \n> Signed-off-by: Thomas Rast <trast@student.ethz.ch>\n> ---\n>  Documentation/git-commit-tree.txt |   10 +++++-----\n>  1 files changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\n> index feec584..92ab3ab 100644\n> --- a/Documentation/git-commit-tree.txt\n> +++ b/Documentation/git-commit-tree.txt\n> @@ -16,12 +16,12 @@ This is usually not what an end user wants to run directly.  See\n>  linkgit:git-commit[1] instead.\n>  \n>  Creates a new commit object based on the provided tree object and\n> -emits the new commit object id on stdout. If no parent is given then\n> -it is considered to be an initial tree.\n> +emits the new commit object id on stdout.\n\nOops.\n\nCiao,\nDscho\n"},{"id":"86491","messageId":"200808081341.24451.trast@student.ethz.ch","threadId":"14885","inReplyTo":"alpine.DEB.1.00.0808081238250.9611@pacific.mpi-cbg.de.mpi-cbg.de","subject":"Re: [PATCH] Documentation: commit-tree: remove 16 parents restriction","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2008-08-08T11:41:22Z","receivedAt":"2008-08-08T11:41:22Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Johannes Schindelin wrote:\n> \n> On Fri, 8 Aug 2008, Thomas Rast wrote:\n> \n> >  Creates a new commit object based on the provided tree object and\n> > -emits the new commit object id on stdout. If no parent is given then\n> > -it is considered to be an initial tree.\n> > +emits the new commit object id on stdout.\n> \n> Oops.\n\nI deliberately removed that sentence because I wanted to enumerate all\noptions in the new second paragraph (0, 1, or many), and felt it would\nbe redundant.\n\n- Thomas\n\n-- \nThomas Rast\ntrast@student.ethz.ch\n\n"}]}