Skip to content

Commit

Permalink
-u is now default for 'git-applymbox'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jan 10, 2007
1 parent 3cf167b commit 62c89c6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
14 changes: 7 additions & 7 deletions Documentation/git-applymbox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/<num>::
When the patch contained in an e-mail does not cleanly
Expand Down
3 changes: 2 additions & 1 deletion git-applymbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | 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 ;;
Expand Down

0 comments on commit 62c89c6

Please sign in to comment.