mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
-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:
parent
3cf167ba4b
commit
62c89c662f
|
@ -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
|
||||
|
|
|
@ -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 ;;
|
||||
|
|
Loading…
Reference in a new issue