summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-09 21:16:45 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-09 21:16:45 -0800
commit3cf167ba4bac1be5f52acae0a582d907121982b2 (patch)
tree18506d455c2d61708d6e563e54766f6f8806da89 /git-am.sh
parent1c23d794bfa3b9f3e03b18bb7e542615a924dbe3 (diff)
downloadgit-3cf167ba4bac1be5f52acae0a582d907121982b2.tar.gz
git-am: should work when "--no-utf8 --utf8" is given
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index d9eb79d1aa..abd32a8b1c 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -128,7 +128,7 @@ do
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
sign=t; shift ;;
-u|--u|--ut|--utf|--utf8)
- shift ;; # this is now default
+ utf8=t; shift ;; # this is now default
--no-u|--no-ut|--no-utf|--no-utf8)
utf8=; shift ;;
-k|--k|--ke|--kee|--keep)