diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-21 13:58:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-21 13:58:58 -0800 |
| commit | ac28f435739c9f25c4a82bae6006e4e414554a64 (patch) | |
| tree | 144913c930bd4282b644d042e5efe3d581df7431 /git-fast-import.txt | |
| parent | f2b7494f8bfdb746bbedce9cf8095db7164f92b0 (diff) | |
| download | git-htmldocs-ac28f435739c9f25c4a82bae6006e4e414554a64.tar.gz | |
Autogenerated HTML docs for v1.8.0-273-g2d242
Diffstat (limited to 'git-fast-import.txt')
| -rw-r--r-- | git-fast-import.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt index 6603a7ab7..959e4d3ae 100644 --- a/git-fast-import.txt +++ b/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 |