diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-17 06:40:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-17 06:40:45 +0900 |
| commit | 608b11da2f9110b9b1ce96eb56f84676567afec3 (patch) | |
| tree | 0906054dc79cb4c281e6095e61af93dce616e322 /git-mailinfo.txt | |
| parent | 766021adccd91e4e3bd819f1497156306f0e0687 (diff) | |
| download | git-htmldocs-608b11da2f9110b9b1ce96eb56f84676567afec3.tar.gz | |
Autogenerated HTML docs for v2.32.0-rc0
Diffstat (limited to 'git-mailinfo.txt')
| -rw-r--r-- | git-mailinfo.txt | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/git-mailinfo.txt b/git-mailinfo.txt index d343f040f..3fcfd965f 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -9,7 +9,9 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message SYNOPSIS -------- [verse] -'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch> +'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] + [--[no-]scissors] [--quoted-cr=<action>] + <msg> <patch> DESCRIPTION @@ -89,6 +91,23 @@ This can be enabled by default with the configuration option mailinfo.scissors. --no-scissors:: Ignore scissors lines. Useful for overriding mailinfo.scissors settings. +--quoted-cr=<action>:: + Action when processes email messages sent with base64 or + quoted-printable encoding, and the decoded lines end with a CRLF + instead of a simple LF. ++ +The valid actions are: ++ +-- +* `nowarn`: Git will do nothing when such a CRLF is found. +* `warn`: Git will issue a warning for each message if such a CRLF is + found. +* `strip`: Git will convert those CRLF to LF. +-- ++ +The default action could be set by configuration option `mailinfo.quotedCR`. +If no such configuration option has been set, `warn` will be used. + <msg>:: The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject. |