-u is now default for 'git-applymbox'

It has '-n' to disable it just in case, but do not even bother
documenting it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2007-01-09 21:20:01 -08:00
parent 3cf167ba4b
commit 62c89c662f
2 changed files with 9 additions and 8 deletions

View File

@ -42,12 +42,12 @@ OPTIONS
and the current tree. and the current tree.
-u:: -u::
By default, the commit log message, author name and The commit log message, author name and author email are
author email are taken from the e-mail without any taken from the e-mail, and after minimally decoding MIME
charset conversion, after minimally decoding MIME transfer encoding, re-coded in UTF-8 by transliterating
transfer encoding. This flag causes the resulting them. This used to be optional but now it is the default.
commit to be encoded in utf-8 by transliterating them. +
Note that the patch is always used as is without charset Note that the patch is always used as-is without charset
conversion, even with this flag. conversion, even with this flag.
-c .dotest/<num>:: -c .dotest/<num>::

View File

@ -23,11 +23,12 @@ USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
git var GIT_COMMITTER_IDENT >/dev/null || exit git var GIT_COMMITTER_IDENT >/dev/null || exit
keep_subject= query_apply= continue= utf8= resume=t keep_subject= query_apply= continue= utf8=-u resume=t
while case "$#" in 0) break ;; esac while case "$#" in 0) break ;; esac
do do
case "$1" in case "$1" in
-u) utf8=-u ;; -u) utf8=-u ;;
-n) utf8= ;;
-k) keep_subject=-k ;; -k) keep_subject=-k ;;
-q) query_apply=t ;; -q) query_apply=t ;;
-c) continue="$2"; resume=f; shift ;; -c) continue="$2"; resume=f; shift ;;