summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-08-12 10:46:38 -0700
committerJunio C Hamano <gitster@pobox.com>2019-08-12 10:46:38 -0700
commit556b57eb47f042408d3669a27a0a60a50a7de4a8 (patch)
tree96a1342d92ac4a65164940f2eac8eff89ab39bec /git-fast-import.txt
parentb52664793b8af2208fdb1ec716b959e67c38ef7d (diff)
downloadgit-htmldocs-556b57eb47f042408d3669a27a0a60a50a7de4a8.tar.gz
Autogenerated HTML docs for v2.23.0-rc2-8-gff669
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index 7baf9e47b..fad327aec 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -425,7 +425,7 @@ the same commit, as `filedeleteall` wipes the branch clean (see below).
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`,
+`data` command (i.e. it 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.