Junio C Hamano wrote: > @@ -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 ;; > How is git-am --no-utf8 --utf8 mbox to be interpreted? I'd expect that the last option on the command line has precedence, for example, if git-am is used in a script like this: git-am --no-utf8 $userpreferences $mbox With you patch --no-utf8 always overrides any --utf8 that is specified. -- Hannes - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html