mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'esr/maint-doc-fast-import'

Browse Source 
* esr/maint-doc-fast-import:
  doc/fast-import: clarify how content states are built
This commit is contained in:
Junio C Hamano
2012-11-21 13:32:48 -08:00
parent 681b036fa0 e70528862f
commit 22d33a20f9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-fast-import.txt
View File

@ -442,7 +442,9 @@ their syntax.
^^^^^^ ^^^^^^
The `from` command is used to specify the commit to initialize The `from` command is used to specify the commit to initialize
this branch from. This revision will be the first ancestor of the 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 Omitting the `from` command in the first commit of a new branch
will cause fast-import to create that commit with no ancestor. This will cause fast-import to create that commit with no ancestor. This
@ -492,7 +494,9 @@ existing value of the branch.
`merge` `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 omitted when creating a new branch, the first `merge` commit will be
the first ancestor of the current commit, and the branch will start the first ancestor of the current commit, and the branch will start
out with no files. An unlimited number of `merge` commands per out with no files. An unlimited number of `merge` commands per