From 3cf167ba4bac1be5f52acae0a582d907121982b2 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 Jan 2007 21:16:45 -0800
Subject: [PATCH] git-am: should work when "--no-utf8 --utf8" is given

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 git-am.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
2.40.0