diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 20:42:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 20:42:54 (GMT) |
| commit | f4216e5968778a8710e5fc0f4dc7ecdcc53b6448 (patch) | |
| tree | 5762bde21199c4a6b09c83a30740394e48dc3e20 /Documentation | |
| parent | fdee8b170d42d3502aa461208436102cf68a95f8 (diff) | |
| parent | 19d097e3d73b4d3635bbe0e8735b2f059d59f29a (diff) | |
| download | git-f4216e5968778a8710e5fc0f4dc7ecdcc53b6448.zip git-f4216e5968778a8710e5fc0f4dc7ecdcc53b6448.tar.gz git-f4216e5968778a8710e5fc0f4dc7ecdcc53b6448.tar.bz2 | |
Merge branch 'eb/format-patch-no-encode-headers'
The output from "git format-patch" uses RFC 2047 encoding for
non-ASCII letters on From: and Subject: headers, so that it can
directly be fed to e-mail programs. A new option has been added
to produce these headers in raw.
* eb/format-patch-no-encode-headers:
format-patch: teach --no-encode-email-headers
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/format.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-format-patch.txt | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt index 45c7bd5..564e809 100644 --- a/Documentation/config/format.txt +++ b/Documentation/config/format.txt @@ -57,6 +57,11 @@ format.suffix:: `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it). +format.encodeEmailHeaders:: + Encode email headers that have non-ASCII characters with + "Q-encoding" (described in RFC 2047) for email transmission. + Defaults to true. + format.pretty:: The default pretty format for log/show/whatchanged command, See linkgit:git-log[1], linkgit:git-show[1], diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 0d4f895..0f81d04 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -24,6 +24,7 @@ SYNOPSIS [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--[no-]cover-letter] [--quiet] + [--[no-]encode-email-headers] [--no-notes | --notes[=<ref>]] [--interdiff=<previous>] [--range-diff=<previous> [--creation-factor=<percent>]] @@ -253,6 +254,13 @@ feeding the result to `git send-email`. containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out. +--encode-email-headers:: +--no-encode-email-headers:: + Encode email headers that have non-ASCII characters with + "Q-encoding" (described in RFC 2047), instead of outputting the + headers verbatim. Defaults to the value of the + `format.encodeEmailHeaders` configuration variable. + --interdiff=<previous>:: As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing |