kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2019-08-22 12:34:12 -07:00
parent 9c7573581c d1387d3895
commit 22e86e85cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-fast-import.txt
View File

@ -391,7 +391,7 @@ change to the project.
('encoding' SP <encoding>)? ('encoding' SP <encoding>)?
data data
('from' SP <commit-ish> LF)? ('from' SP <commit-ish> LF)?
('merge' SP <commit-ish> LF)? ('merge' SP <commit-ish> LF)*
(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
LF? LF?
.... ....