diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
| commit | b76a68630eaab75c4eb1c41f0fc091811854ff43 (patch) | |
| tree | 5be60264e80970f60d9c56b410c8828693be8588 /git-fast-import.txt | |
| parent | 0aadbc37c068365a09926cd895863c4a725b45d6 (diff) | |
| download | git-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz | |
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'git-fast-import.txt')
| -rw-r--r-- | git-fast-import.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt index b52dca513..2620d28b4 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -479,9 +479,9 @@ current branch value should be written as: ---- from refs/heads/branch^0 ---- -The `{caret}0` suffix is necessary as fast-import does not permit a branch to +The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the -`from` command is even read from the input. Adding `{caret}0` will force +`from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch. @@ -979,7 +979,7 @@ Reading from a named tree:: See `filemodify` above for a detailed description of `<path>`. -Output uses the same format as `git ls-tree <tree> {litdd} <path>`: +Output uses the same format as `git ls-tree <tree> -- <path>`: ==== <mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF |