summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-08-29 07:12:49 +0000
committerJunio C Hamano <junio@kernel.org>2011-08-29 07:12:49 +0000
commit6e41cb3e3fed66e67c91f92710be792ee001702a (patch)
tree1d5b1dfe26c8b6b8b6180208056786be378027c0 /git-fast-import.txt
parentd8fa0220d0e7f4c6a58a7132a4c500467ff43314 (diff)
downloadgit-htmldocs-6e41cb3e3fed66e67c91f92710be792ee001702a.tar.gz
Autogenerated HTML docs for v1.7.7-rc0-70-g82660
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index db0d75fdb..ec6ef3119 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -425,8 +425,8 @@ Here `<name>` is the person's display name (for example
(``cm@example.com''). `LT` and `GT` are the literal less-than (\x3c)
and greater-than (\x3e) symbols. These are required to delimit
the email address from the other fields in the line. Note that
-`<name>` is free-form and may contain any sequence of bytes, except
-`LT` and `LF`. It is typically UTF-8 encoded.
+`<name>` and `<email>` are free-form and may contain any sequence
+of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded.
The time of the change is specified by `<when>` using the date format
that was selected by the \--date-format=<fmt> command line option.