diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:18:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:18:47 -0700 |
| commit | 0b98954975502f56f1de2a4cb0569f7e80fd44d0 (patch) | |
| tree | 25e591cd0b0743533cf14a3b7a9b5d2620e39671 /Documentation/git-fast-import.txt | |
| parent | d39753c23824f0c384a7932f3772f0ddc25010f7 (diff) | |
| parent | 53f53cff24c5fe6683234bcd5386a447b8b17074 (diff) | |
| download | git-0b98954975502f56f1de2a4cb0569f7e80fd44d0.tar.gz | |
Merge branch 'di/fast-import-ident'
* di/fast-import-ident:
fsck: improve committer/author check
fsck: add a few committer name tests
fast-import: check committer name more strictly
fast-import: don't fail on omitted committer name
fast-import: add input format tests
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index db0d75fdbc..ec6ef31197 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/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. |