@matheusbsbs / matheus-bagliano / commits / 62c89c662f
Fork 0

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

Junio C Hamano committed Jan 9, 2007 at 21:20 UTC 62c89c662fc6220522adc009aa95b1392350ed20
2 files changed +9 -8
Documentation/git-applymbox.txt
+7 -7
@@ -42,13 +42,13 @@ OPTIONS
42 and the current tree.
43
44 -u::
45 - By default, the commit log message, author name and
46 - author email are taken from the e-mail without any
47 - charset conversion, after minimally decoding MIME
48 - transfer encoding. This flag causes the resulting
49 - commit to be encoded in utf-8 by transliterating them.
50 - Note that the patch is always used as is without charset
51 - conversion, even with this flag.
45 + The commit log message, author name and author email are
46 + taken from the e-mail, and after minimally decoding MIME
47 + transfer encoding, re-coded in UTF-8 by transliterating
48 + them. This used to be optional but now it is the default.
49 ++
50 +Note that the patch is always used as-is without charset
51 +conversion, even with this flag.
52
53 -c .dotest/<num>::
54 When the patch contained in an e-mail does not cleanly
git-applymbox.sh
+2 -1
@@ -23,11 +23,12 @@ USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
23
24 git var GIT_COMMITTER_IDENT >/dev/null || exit
25
26 -keep_subject= query_apply= continue= utf8= resume=t
26 +keep_subject= query_apply= continue= utf8=-u resume=t
27 while case "$#" in 0) break ;; esac
28 do
29 case "$1" in
30 -u) utf8=-u ;;
31 + -n) utf8= ;;
32 -k) keep_subject=-k ;;
33 -q) query_apply=t ;;
34 -c) continue="$2"; resume=f; shift ;;