From: Junio C Hamano Date: Tue, 9 Jan 2007 11:13:47 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.4.4-g1295 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d3a6c7b01d9db283c9d0ababbd787b5ff9f48be;p=git.git Autogenerated HTML docs for v1.4.4.4-g1295 --- diff --git a/git-am.html b/git-am.html index b26e4b4ea..c06f394cf 100644 --- a/git-am.html +++ b/git-am.html @@ -273,7 +273,7 @@ git-am(1) Manual Page

SYNOPSIS

-
git-am [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] +
git-am [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way] [--interactive] [--whitespace=<option>] <mbox>… git-am [--skip | --resolved]
@@ -305,11 +305,33 @@ current branch.

---utf8, --keep +--keep

- Pass -u and -k flags to git-mailinfo (see + Pass -k flag to git-mailinfo (see git-mailinfo(1)). +

+
+
+--utf8 +
+
+

+ Pass -u flag to git-mailinfo (see git-mailinfo(1)). + The proposed commit log message taken from the e-mail + are re-coded into UTF-8 encoding (configuration variable + i18n.commitencoding can be used to specify project's + preferred encoding if it is not UTF-8). +

+

This was optional in prior versions of git, but now it is the +default. You could use --no-utf8 to override this.

+
+
+--no-utf8 +
+
+

+ Do not pass -u flag to git-mailinfo (see git-mailinfo(1)).

@@ -418,7 +440,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 910457d3b..53e81cb10 100644 --- a/git-am.txt +++ b/git-am.txt @@ -9,7 +9,7 @@ git-am - Apply a series of patches in a mailbox SYNOPSIS -------- [verse] -'git-am' [--signoff] [--dotest=] [--utf8] [--binary] [--3way] +'git-am' [--signoff] [--dotest=] [--utf8 | --no-utf8] [--binary] [--3way] [--interactive] [--whitespace=