{"thread":{"id":"32017","subject":"[PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.","startedAt":"2012-11-05T04:31:01Z","lastAt":"2012-11-08T18:32:42Z","messageCount":3,"participants":["Eric S. Raymond","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"202534","messageId":"20121105043101.GA24687@thyrsus.com","threadId":"32017","inReplyTo":null,"subject":"[PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.","fromName":"Eric S. Raymond","fromEmail":"esr@thyrsus.com","sentAt":"2012-11-05T04:31:01Z","receivedAt":"2012-11-05T04:31:01Z","isPatch":true,"sender":{"key":"esr@thyrsus.com","avatar":"https://avatars.githubusercontent.com/u/727961?v=4"},"body":"\n---\n Documentation/git-fast-import.txt |    8 ++++++--\n 1 file changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt\nindex 6603a7a..959e4d3 100644\n--- a/Documentation/git-fast-import.txt\n+++ b/Documentation/git-fast-import.txt\n@@ -442,7 +442,9 @@ their syntax.\n ^^^^^^\n The `from` command is used to specify the commit to initialize\n this branch from.  This revision will be the first ancestor of the\n-new commit.\n+new commit.  The state of the tree built at this commit will begin\n+with the state at the `from` commit, and be altered by the content\n+modifications in this commit.\n \n Omitting the `from` command in the first commit of a new branch\n will cause fast-import to create that commit with no ancestor. This\n@@ -492,7 +494,9 @@ existing value of the branch.\n \n `merge`\n ^^^^^^^\n-Includes one additional ancestor commit.  If the `from` command is\n+Includes one additional ancestor commit.  The additional ancestry\n+link does not change the way the tree state is built at this commit.\n+If the `from` command is\n omitted when creating a new branch, the first `merge` commit will be\n the first ancestor of the current commit, and the branch will start\n out with no files.  An unlimited number of `merge` commands per\n-- \n1.7.9.5\n\n\n-- \n\t\t<a href=\"http://www.catb.org/~esr/\">Eric S. Raymond</a>\n"},{"id":"202657","messageId":"20121108174300.GI15560@sigill.intra.peff.net","threadId":"32017","inReplyTo":"20121105043101.GA24687@thyrsus.com","subject":"Re: [PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-11-08T17:43:00Z","receivedAt":"2012-11-08T17:43:00Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Nov 04, 2012 at 11:31:01PM -0500, Eric S. Raymond wrote:\n\n> \n> ---\n>  Documentation/git-fast-import.txt |    8 ++++++--\n>  1 file changed, 6 insertions(+), 2 deletions(-)\n\nLooks reasonable. Sign-off?\n\n-Peff\n"},{"id":"202662","messageId":"20121108183242.GA17950@sigill.intra.peff.net","threadId":"32017","inReplyTo":"20121108183038.GA4003@thyrsus.com","subject":"Re: [PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-11-08T18:32:42Z","receivedAt":"2012-11-08T18:32:42Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Nov 08, 2012 at 01:30:38PM -0500, Eric wrote:\n\n> > Looks reasonable. Sign-off?\n> > \n> \n> Ah, right.  Shall resend with signoff.  Probably Tuesday - I'm on the\n> road, and the git instance on my laptop is prone to library-load issues.\n> \n> Or you can just add\n> \n> Signed-off-by: Eric S. Raymond <esr@thyrsus.com>\n\nThat's fine. I can fix it up locally. Thanks.\n\n-Peff\n"}]}