# [PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.
3 messages from 2012-11-05 to 2012-11-08. Participants: Eric S. Raymond, Jeff King.
Thread: https://gitlist.dev/t/32017
## Eric S. Raymond, 2012-11-05 04:31
Subject: [PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.
Message-ID: <20121105043101.GA24687@thyrsus.com>
URL: https://gitlist.dev/e/20121105043101.GA24687%40thyrsus.com
```
---
Documentation/git-fast-import.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 6603a7a..959e4d3 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -442,7 +442,9 @@ their syntax.
^^^^^^
The `from` command is used to specify the commit to initialize
this branch from. This revision will be the first ancestor of the
-new commit.
+new commit. The state of the tree built at this commit will begin
+with the state at the `from` commit, and be altered by the content
+modifications in this commit.
Omitting the `from` command in the first commit of a new branch
will cause fast-import to create that commit with no ancestor. This
@@ -492,7 +494,9 @@ existing value of the branch.
`merge`
^^^^^^^
-Includes one additional ancestor commit. If the `from` command is
+Includes one additional ancestor commit. The additional ancestry
+link does not change the way the tree state is built at this commit.
+If the `from` command is
omitted when creating a new branch, the first `merge` commit will be
the first ancestor of the current commit, and the branch will start
out with no files. An unlimited number of `merge` commands per
--
1.7.9.5
--
Eric S. Raymond
```
## Jeff King, 2012-11-08 17:43
Subject: Re: [PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.
Message-ID: <20121108174300.GI15560@sigill.intra.peff.net>
URL: https://gitlist.dev/e/20121108174300.GI15560%40sigill.intra.peff.net
In-Reply-To: <20121105043101.GA24687@thyrsus.com>
```
On Sun, Nov 04, 2012 at 11:31:01PM -0500, Eric S. Raymond wrote:
>
> ---
> Documentation/git-fast-import.txt | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
Looks reasonable. Sign-off?
-Peff
```
## Jeff King, 2012-11-08 18:32
Subject: Re: [PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.
Message-ID: <20121108183242.GA17950@sigill.intra.peff.net>
URL: https://gitlist.dev/e/20121108183242.GA17950%40sigill.intra.peff.net
In-Reply-To: <20121108183038.GA4003@thyrsus.com>
```
On Thu, Nov 08, 2012 at 01:30:38PM -0500, Eric wrote:
> > Looks reasonable. Sign-off?
> >
>
> Ah, right. Shall resend with signoff. Probably Tuesday - I'm on the
> road, and the git instance on my laptop is prone to library-load issues.
>
> Or you can just add
>
> Signed-off-by: Eric S. Raymond
That's fine. I can fix it up locally. Thanks.
-Peff
```