aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-08 13:59:15 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-08 14:45:59 -0800
commitd84029b6738197fa409861597934b29bbebad262 (patch)
treedb99dbaa18149139384a8e7a4d5e5c1f7e9cd3c8 /Documentation
parent521f9c4def9430526bfdfffdb8ed4c2f4166bece (diff)
downloadgit-d84029b6738197fa409861597934b29bbebad262.tar.gz
git-d84029b6738197fa409861597934b29bbebad262.tar.xz
--utf8 is now default for 'git-am'
Since we are talking about allowing potentially incompatible UI changes in v1.5.0 iff the change improves the general situation, I would say why not. There is --no-utf8 flag to avoid re-coding from botching the log message just in case, but we may not even need it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-am.txt19
1 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 910457d3b..53e81cb10 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -9,7 +9,7 @@ git-am - Apply a series of patches in a mailbox
SYNOPSIS
--------
[verse]
-'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
[--interactive] [--whitespace=<option>] <mbox>...
'git-am' [--skip | --resolved]
@@ -29,8 +29,21 @@ OPTIONS
Instead of `.dotest` directory, use <dir> as a working
area to store extracted patches.
---utf8, --keep::
- Pass `-u` and `-k` flags to `git-mailinfo` (see
+--keep::
+ Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
+
+--utf8::
+ 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 was optional in prior versions of git, but now it is the
+default. You could use `--no-utf8` to override this.
+
+--no-utf8::
+ Do not pass `-u` flag to `git-mailinfo` (see
gitlink:git-mailinfo[1]).
--binary::