diff options
| author | Elijah Newren <newren@gmail.com> | 2019-02-20 14:58:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-01 11:59:08 +0900 |
| commit | 62edbec7dee0bc9788d60823ca074d7dfbb5a486 (patch) | |
| tree | afd31d4a04590cb27de2a40ea221c84b8ab9c05e /Documentation/git-fast-import.txt | |
| parent | aeb582a98374c094361cba1bd756dc6307432c42 (diff) | |
| download | git-62edbec7dee0bc9788d60823ca074d7dfbb5a486.tar.gz | |
t9300: demonstrate bug with get-mark and empty orphan commits
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 43ab3b1637..339b6e7e98 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -422,7 +422,12 @@ However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below). -The `LF` after the command is optional (it used to be required). +The `LF` after the command is optional (it used to be required). Note +that for reasons of backward compatibility, if the commit ends with a +`data` command (i.e. it has has no `from`, `merge`, `filemodify`, +`filedelete`, `filecopy`, `filerename`, `filedeleteall` or +`notemodify` commands) then two `LF` commands may appear at the end of +the command instead of just one. `author` ^^^^^^^^ |