mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
5c19f244c3
commit
982f65ace6
|
@ -42,14 +42,20 @@ OPTIONS
|
||||||
and the current tree.
|
and the current tree.
|
||||||
|
|
||||||
-u::
|
-u::
|
||||||
The commit log message, author name and author email are
|
Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
|
||||||
taken from the e-mail, and after minimally decoding MIME
|
The proposed commit log message taken from the e-mail
|
||||||
transfer encoding, re-coded in UTF-8 by transliterating
|
are re-coded into UTF-8 encoding (configuration variable
|
||||||
them. This used to be optional but now it is the default.
|
`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
|
Note that the patch is always used as-is without charset
|
||||||
conversion, even with this flag.
|
conversion, even with this flag.
|
||||||
|
|
||||||
|
-n::
|
||||||
|
Pass `-n` flag to `git-mailinfo` (see
|
||||||
|
gitlink:git-mailinfo[1]).
|
||||||
|
|
||||||
-c .dotest/<num>::
|
-c .dotest/<num>::
|
||||||
When the patch contained in an e-mail does not cleanly
|
When the patch contained in an e-mail does not cleanly
|
||||||
apply, the command exits with an error message. The
|
apply, the command exits with an error message. The
|
||||||
|
|
Loading…
Reference in a new issue