--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>
Junio C Hamano committed
Jan 8, 2007 at 13:59 UTC
d84029b6738197fa409861597934b29bbebad262
2 files changed
+21
-6
Documentation/git-am.txt
+16
-3
@@ -9,7 +9,7 @@ git-am - Apply a series of patches in a mailbox
9
SYNOPSIS
10
--------
11
[verse]
12
-'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
12
+'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
13
[--interactive] [--whitespace=<option>] <mbox>...
14
'git-am' [--skip | --resolved]
15
@@ -29,8 +29,21 @@ OPTIONS
29
Instead of `.dotest` directory, use <dir> as a working
30
area to store extracted patches.
31
32
---utf8, --keep::
33
- Pass `-u` and `-k` flags to `git-mailinfo` (see
32
+--keep::
33
+ Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
34
+
35
+--utf8::
36
+ Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
37
+ The proposed commit log message taken from the e-mail
38
+ are re-coded into UTF-8 encoding (configuration variable
39
+ `i18n.commitencoding` can be used to specify project's
40
+ preferred encoding if it is not UTF-8).
41
++
42
+This was optional in prior versions of git, but now it is the
43
+default. You could use `--no-utf8` to override this.
44
+
45
+--no-utf8::
46
+ Do not pass `-u` flag to `git-mailinfo` (see
47
gitlink:git-mailinfo[1]).
48
49
--binary::
git-am.sh
+5
-3
@@ -2,7 +2,7 @@
2
#
3
# Copyright (c) 2005, 2006 Junio C Hamano
4
5
-USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
5
+USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
6
[--interactive] [--whitespace=<option>] <mbox>...
7
or, when resuming [--skip | --resolved]'
8
. git-sh-setup
@@ -105,7 +105,7 @@ It does not apply to blobs recorded in its index."
105
}
106
107
prec=4
108
-dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg=
108
+dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= ws= resolvemsg=
109
110
while case "$#" in 0) break;; esac
111
do
@@ -128,7 +128,9 @@ do
128
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
129
sign=t; shift ;;
130
-u|--u|--ut|--utf|--utf8)
131
- utf8=t; shift ;;
131
+ shift ;; # this is now default
132
+ --no-u|--no-ut|--no-utf|--no-utf8)
133
+ utf8=; shift ;;
134
-k|--k|--ke|--kee|--keep)
135
keep=t; shift ;;
136