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.html | |
| parent | 446d0110df26180db61200a5228adf97bf072939 (diff) | |
| download | git-htmldocs-926cc052d4e49ae0c1af3703c87b0d1037d7fbac.tar.gz | |
Autogenerated HTML docs for v2.23.0-37-g745f6
Diffstat (limited to 'git-fast-import.html')
| -rw-r--r-- | git-fast-import.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fast-import.html b/git-fast-import.html index bfebfaaa5..9b807fc73 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1289,7 +1289,7 @@ change to the project.</p></div> ('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?</code></pre>
</div></div>
@@ -2529,7 +2529,7 @@ compression.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2019-08-12 10:43:45 PDT
+ 2019-08-22 13:34:29 PDT
</div>
</div>
</body>
|