From 62c89c662fc6220522adc009aa95b1392350ed20 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 9 Jan 2007 21:20:01 -0800 Subject: -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 --- Documentation/git-applymbox.txt | 14 +++++++------- git-applymbox.sh | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index f74c6a49b..95dc65a58 100644 --- a/Documentation/git-applymbox.txt +++ b/Documentation/git-applymbox.txt @@ -42,13 +42,13 @@ OPTIONS and the current tree. -u:: - By default, the commit log message, author name and - author email are taken from the e-mail without any - charset conversion, after minimally decoding MIME - transfer encoding. This flag causes the resulting - commit to be encoded in utf-8 by transliterating them. - Note that the patch is always used as is without charset - conversion, even with this flag. + The commit log message, author name and author email are + taken from the e-mail, and after minimally decoding MIME + transfer encoding, re-coded in UTF-8 by transliterating + them. This used to be optional but now it is the default. ++ +Note that the patch is always used as-is without charset +conversion, even with this flag. -c .dotest/:: When the patch contained in an e-mail does not cleanly diff --git a/git-applymbox.sh b/git-applymbox.sh index 5569fdcc3..7e690a16e 100755 --- a/git-applymbox.sh +++ b/git-applymbox.sh @@ -23,11 +23,12 @@ USAGE='[-u] [-k] [-q] [-m] (-c .dotest/ | mbox) [signoff]' 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 do case "$1" in -u) utf8=-u ;; + -n) utf8= ;; -k) keep_subject=-k ;; -q) query_apply=t ;; -c) continue="$2"; resume=f; shift ;; -- cgit v1.2.1