doc/fast-import: clarify how content states are built
Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Jeff King <peff@peff.net>
Eric S. Raymond committed
Nov 4, 2012 at 23:31 UTC
e70528862f0f67fdb6bd67d8819d5b01156eacdc
1 file changed
+6
-2
Documentation/git-fast-import.txt
+6
-2
@@ -442,7 +442,9 @@ their syntax.
442
^^^^^^
443
The `from` command is used to specify the commit to initialize
444
this branch from. This revision will be the first ancestor of the
445
-new commit.
445
+new commit. The state of the tree built at this commit will begin
446
+with the state at the `from` commit, and be altered by the content
447
+modifications in this commit.
448
449
Omitting the `from` command in the first commit of a new branch
450
will cause fast-import to create that commit with no ancestor. This
@@ -492,7 +494,9 @@ existing value of the branch.
494
495
`merge`
496
^^^^^^^
495
-Includes one additional ancestor commit. If the `from` command is
497
+Includes one additional ancestor commit. The additional ancestry
498
+link does not change the way the tree state is built at this commit.
499
+If the `from` command is
500
omitted when creating a new branch, the first `merge` commit will be
501
the first ancestor of the current commit, and the branch will start
502
out with no files. An unlimited number of `merge` commands per