diff options
| author | Zhang Le <r0bertz@gentoo.org> | 2010-06-14 02:49:47 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 20:18:23 -0700 |
| commit | e0a9110176e3b17414b1b38fae8febd0791eaa0c (patch) | |
| tree | 4355a4b8e4f328a55bc770343ad915b37730b2af /Documentation/git-mailinfo.txt | |
| parent | 74e42ce122bfcbd2e1a06395b80d6a4b44580148 (diff) | |
| download | git-e0a9110176e3b17414b1b38fae8febd0791eaa0c.tar.gz | |
git-mailinfo documentation: clarify -u/--encoding
Instead of talking about hardcoded UTF-8, describe i18n.commitencoding
and the --encoding option, and state that they default to UTF-8.
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mailinfo.txt')
| -rw-r--r-- | Documentation/git-mailinfo.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index e3d58cbac3..3ea5aad56c 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -40,16 +40,16 @@ OPTIONS -u:: The commit log message, author name and author email are taken from the e-mail, and after minimally decoding MIME - transfer encoding, re-coded in UTF-8 by transliterating + transfer encoding, re-coded in the charset specified by + i18n.commitencoding (defaulting to UTF-8) by transliterating them. This used to be optional but now it is the default. + Note that the patch is always used as-is without charset conversion, even with this flag. --encoding=<encoding>:: - Similar to -u but if the local convention is different - from what is specified by i18n.commitencoding, this flag - can be used to override it. + Similar to -u. But when re-coding, the charset specified here is + used instead of the one specified by i18n.commitencoding or UTF-8. -n:: Disable all charset re-coding of the metadata. |