[PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.

[PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.

[Eric S. Raymond]

---
 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


-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

Re: [PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.

[Jeff King]

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

Re: [PATCH] Clarify how content states are to be built as the fast-import stream is interpreted.

[Jeff King]

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 <esr@thyrsus.com>

That's fine. I can fix it up locally. Thanks.

-Peff