diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-21 13:32:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-21 13:32:48 -0800 |
| commit | 22d33a20f9327deeec2243b4c18b8f77989e9552 (patch) | |
| tree | a120e8391c3c34dff336b2cc8cc46a70f831d547 /Documentation | |
| parent | 681b036fa0461fa40f5c8caedd06579ab52e671e (diff) | |
| parent | e70528862f0f67fdb6bd67d8819d5b01156eacdc (diff) | |
| download | git-22d33a20f9327deeec2243b4c18b8f77989e9552.tar.gz | |
Merge branch 'esr/maint-doc-fast-import'
* esr/maint-doc-fast-import:
doc/fast-import: clarify how content states are built
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-import.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 6603a7ab73..959e4d3aee 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 |