Update git-applymbox documentation
Documentation/git-applymbox.txt: updating -u documentation to include fact that it encodes to the i18n.commitencoding setting, not just utf-8. Added documentation of -n option to pass -n to git-mailinfo. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Andrew Ruder committed
Apr 16, 2007 at 01:40 UTC
982f65ace6c2be08b881318ca3241736dddd8aee
1 file changed
+10
-4
Documentation/git-applymbox.txt
+10
-4
@@ -42,14 +42,20 @@ OPTIONS
42
and the current tree.
43
44
-u::
45
- The commit log message, author name and author email are
46
- taken from the e-mail, and after minimally decoding MIME
47
- transfer encoding, re-coded in UTF-8 by transliterating
48
- them. This used to be optional but now it is the default.
45
+ Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
46
+ The proposed commit log message taken from the e-mail
47
+ are re-coded into UTF-8 encoding (configuration variable
48
+ `i18n.commitencoding` can be used to specify project's
49
+ preferred encoding if it is not UTF-8). This used to be
50
+ optional but now it is the default.
51
+
52
Note that the patch is always used as-is without charset
53
conversion, even with this flag.
54
55
+-n::
56
+ Pass `-n` flag to `git-mailinfo` (see
57
+ gitlink:git-mailinfo[1]).
58
+
59
-c .dotest/<num>::
60
When the patch contained in an e-mail does not cleanly
61
apply, the command exits with an error message. The