X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-applymbox.txt;h=3bc92d8cf17297e7b4a88bd2aeb9339b83d9d283;hb=e18ee576b1420e7b2cfc5c686872fa3b439ac45f;hp=95dc65a583552d4f7e2d1fa34c448832c66a3353;hpb=00cec846f157b5363b0967d1e4cba76b44d48e77;p=git.git diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index 95dc65a58..3bc92d8cf 100644 --- a/Documentation/git-applymbox.txt +++ b/Documentation/git-applymbox.txt @@ -42,14 +42,20 @@ OPTIONS and the current tree. -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 - them. This used to be optional but now it is the default. + Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]). + The proposed commit log message taken from the e-mail + are re-coded into UTF-8 encoding (configuration variable + `i18n.commitencoding` can be used to specify project's + preferred encoding if it is not UTF-8). 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. +-n:: + Pass `-n` flag to `git-mailinfo` (see + gitlink:git-mailinfo[1]). + -c .dotest/:: When the patch contained in an e-mail does not cleanly apply, the command exits with an error message. The