From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 Jan 2007 05:16:45 +0000 (-0800)
Subject: git-am: should work when "--no-utf8 --utf8" is given
X-Git-Tag: v1.5.0-rc1~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3cf167ba4bac1be5f52acae0a582d907121982b2;p=git.git

git-am: should work when "--no-utf8 --utf8" is given

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-am.sh b/git-am.sh
index d9eb79d1a..abd32a8b1 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)