diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-22 12:34:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-22 12:34:12 -0700 |
| commit | 22e86e85cba1e2697aea46810238ef9b3c7401cf (patch) | |
| tree | 9a2a806b4ed5e4e373c854e26df51497fc6b410e /Documentation/git-fast-import.txt | |
| parent | 9c7573581c0804a5225b486d03f45cc3200b69b1 (diff) | |
| parent | d1387d389549fe6e1b97ad88a0f7dbf3afe96c16 (diff) | |
| download | git-22e86e85cba1e2697aea46810238ef9b3c7401cf.tar.gz | |
Merge branch 'en/fast-import-merge-doc'
Doc update.
* en/fast-import-merge-doc:
git-fast-import.txt: clarify that multiple merge commits are allowed
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index fad327aecc..0bb276269e 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/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? .... |