git-am: should work when "--no-utf8 --utf8" is given
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
@ -128,7 +128,7 @@ do
|
|||||||
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
|
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
|
||||||
sign=t; shift ;;
|
sign=t; shift ;;
|
||||||
-u|--u|--ut|--utf|--utf8)
|
-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)
|
--no-u|--no-ut|--no-utf|--no-utf8)
|
||||||
utf8=; shift ;;
|
utf8=; shift ;;
|
||||||
-k|--k|--ke|--kee|--keep)
|
-k|--k|--ke|--kee|--keep)
|
||||||
|
Reference in New Issue
Block a user