diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 21:02:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 21:02:16 -0700 |
| commit | 6339f67fedfec454294dc33ebc3dcec6eeb70e02 (patch) | |
| tree | 7b90636284aa8ca77e917c456234e3859d173f37 /Documentation | |
| parent | a5080d8e10915daa57b5b42c887483d202b45c55 (diff) | |
| parent | e0a9110176e3b17414b1b38fae8febd0791eaa0c (diff) | |
| download | git-6339f67fedfec454294dc33ebc3dcec6eeb70e02.tar.gz git-6339f67fedfec454294dc33ebc3dcec6eeb70e02.tar.xz | |
Merge branch 'maint'
* maint:
git-mailinfo documentation: clarify -u/--encoding
Diffstat (limited to 'Documentation')
| -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 e3d58cbac..3ea5aad56 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. |