summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-06-13 15:09:30 -0700
committerJunio C Hamano <gitster@pobox.com>2019-06-13 15:09:30 -0700
commit5193787ca4fbec1fbd47afd14701cc8a3799641e (patch)
tree12a9d0bb43ba929ff7c759dd2ee8c94b0a73a1e2 /git-fast-import.txt
parent1c05a66ac9af54d408b3d97e791622cbdcf7d8f1 (diff)
downloadgit-htmldocs-5193787ca4fbec1fbd47afd14701cc8a3799641e.tar.gz
Autogenerated HTML docs for v2.22.0-68-g0aae9
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index d65cdb3d0..7baf9e47b 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -388,6 +388,7 @@ change to the project.
original-oid?
('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
+ ('encoding' SP <encoding>)?
data
('from' SP <commit-ish> LF)?
('merge' SP <commit-ish> LF)?
@@ -455,6 +456,12 @@ that was selected by the --date-format=<fmt> command-line option.
See ``Date Formats'' above for the set of supported formats, and
their syntax.
+`encoding`
+^^^^^^^^^^
+The optional `encoding` command indicates the encoding of the commit
+message. Most commits are UTF-8 and the encoding is omitted, but this
+allows importing commit messages into git without first reencoding them.
+
`from`
^^^^^^
The `from` command is used to specify the commit to initialize