diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-01-09 21:20:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-09 21:20:39 -0800 |
| commit | 62c89c662fc6220522adc009aa95b1392350ed20 (patch) | |
| tree | a830f8961d34bc1d8a5b47c5eb84884375448c91 /Documentation | |
| parent | git-am: should work when "--no-utf8 --utf8" is given (diff) | |
| download | tgif-62c89c662fc6220522adc009aa95b1392350ed20.tar.xz | |
-u is now default for 'git-applymbox'
It has '-n' to disable it just in case, but do not even bother
documenting it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-applymbox.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index f74c6a49b3..95dc65a583 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/<num>:: When the patch contained in an e-mail does not cleanly |