X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-applymbox.txt;h=95dc65a583552d4f7e2d1fa34c448832c66a3353;hb=5007af8c7ed04ae5074ee84491526d416d460f97;hp=8f01ca6a16a21fc5697d90be898dd7af05a54bee;hpb=47f0b6d5d49247b85898083d1ccf4f899ef7294a;p=git.git diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index 8f01ca6a1..95dc65a58 100644 --- a/Documentation/git-applymbox.txt +++ b/Documentation/git-applymbox.txt @@ -42,13 +42,13 @@ OPTIONS and the current tree. -u:: - By default, the commit log message, author name and - author email are taken from the e-mail without any - charset conversion, after minimally decoding MIME - transfer encoding. This flag causes the resulting - commit to be encoded in utf-8 by transliterating them. - Note that the patch is always used as is without charset - conversion, even with this flag. + 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. ++ +Note that the patch is always used as-is without charset +conversion, even with this flag. -c .dotest/:: When the patch contained in an e-mail does not cleanly @@ -75,7 +75,7 @@ OPTIONS SEE ALSO -------- -gitlink:git-applypatch[1]. +gitlink:git-am[1], gitlink:git-applypatch[1]. Author