summaryrefslogtreecommitdiff
path: root/git-am.sh
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 /git-am.sh
parent521f9c4def9430526bfdfffdb8ed4c2f4166bece (diff)
downloadgit-d84029b6738197fa409861597934b29bbebad262.tar.gz
--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 'git-am.sh')
-rwxr-xr-xgit-am.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-am.sh b/git-am.sh
index 7c0bb6084b..d9eb79d1aa 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -2,7 +2,7 @@
#
# Copyright (c) 2005, 2006 Junio C Hamano
-USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
[--interactive] [--whitespace=<option>] <mbox>...
or, when resuming [--skip | --resolved]'
. git-sh-setup
@@ -105,7 +105,7 @@ It does not apply to blobs recorded in its index."
}
prec=4
-dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg=
+dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= ws= resolvemsg=
while case "$#" in 0) break;; esac
do
@@ -128,7 +128,9 @@ do
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
sign=t; shift ;;
-u|--u|--ut|--utf|--utf8)
- utf8=t; shift ;;
+ shift ;; # this is now default
+ --no-u|--no-ut|--no-utf|--no-utf8)
+ utf8=; shift ;;
-k|--k|--ke|--kee|--keep)
keep=t; shift ;;