diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-22 13:37:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-22 13:37:21 -0700 |
| commit | 926cc052d4e49ae0c1af3703c87b0d1037d7fbac (patch) | |
| tree | 6a3b82798a2125e6a24825a7e0f08fa780390623 /git-fast-import.txt | |
| parent | 446d0110df26180db61200a5228adf97bf072939 (diff) | |
| download | git-htmldocs-926cc052d4e49ae0c1af3703c87b0d1037d7fbac.tar.gz | |
Autogenerated HTML docs for v2.23.0-37-g745f6
Diffstat (limited to 'git-fast-import.txt')
| -rw-r--r-- | git-fast-import.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt index fad327aec..0bb276269 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -391,7 +391,7 @@ change to the project. ('encoding' SP <encoding>)? data ('from' SP <commit-ish> LF)? - ('merge' SP <commit-ish> LF)? + ('merge' SP <commit-ish> LF)* (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* LF? .... |