diff options
| author |  Andrew Ruder <andy@aeruder.net> | 2007-04-16 01:40:06 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-04-16 01:14:46 -0700 |
| commit | 982f65ace6c2be08b881318ca3241736dddd8aee (patch) | |
| tree | e54d3af5448ab5d0ae2ca5de573ef08f84c53992 | |
| parent | Update git-am documentation (diff) | |
| download | tgif-982f65ace6c2be08b881318ca3241736dddd8aee.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-applymbox.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index 95dc65a583..3bc92d8cf1 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/<num>:: When the patch contained in an e-mail does not cleanly apply, the command exits with an error message. The |