X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-am.txt;h=4fb1d844133ba8350361ee67d074935805a24156;hb=27ebd6e0443bdd795869f598ecebc9eadd64a26c;hp=6645e82b84822e4310b122a8078e1ab16f4dc770;hpb=a9572072f0ab0ac97e64b0dc01254a3ad95befe1;p=git.git
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6645e82b8..4fb1d8441 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -3,12 +3,15 @@ git-am(1)
NAME
----
-git-am - Apply a series of patches in a mailbox
+git-am - Apply a series of patches from a mailbox
SYNOPSIS
--------
-'git-am' [--signoff] [--dotest=
] [--utf8] [--binary] [--3way] ...
+[verse]
+'git-am' [--signoff] [--dotest=] [--utf8 | --no-utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=] [-C] [-p]
+ ...
'git-am' [--skip | --resolved]
DESCRIPTION
@@ -19,6 +22,10 @@ current branch.
OPTIONS
-------
+...::
+ The list of mailbox files to read patches from. If you do not
+ supply this argument, reads from the standard input.
+
--signoff::
Add `Signed-off-by:` line to the commit message, using
the committer identity of yourself.
@@ -27,8 +34,21 @@ OPTIONS
Instead of `.dotest` directory, use as a working
area to store extracted patches.
---utf8, --keep::
- Pass `-u` and `-k` flags to `git-mailinfo` (see
+--keep::
+ Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
+
+--utf8::
+ Pass `-u` flag to `git-mailinfo` (see gitlink: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
gitlink:git-mailinfo[1]).
--binary::
@@ -45,6 +65,14 @@ OPTIONS
Skip the current patch. This is only meaningful when
restarting an aborted patch.
+--whitespace=::
+ This flag is passed to the `git-apply` program that applies
+ the patch.
+
+-C, -p::
+ These flag are passed to the `git-apply` program that applies
+ the patch.
+
--interactive::
Run interactively, just like git-applymbox.
@@ -69,7 +97,7 @@ recover from this in one of two ways:
. hand resolve the conflict in the working directory, and update
the index file to bring it in a state that the patch should
- have produced. Then run the command with '--resume' option.
+ have produced. Then run the command with '--resolved' option.
The command refuses to process new mailboxes while `.dotest`
directory exists, so if you decide to start over from scratch,
@@ -79,7 +107,7 @@ names.
SEE ALSO
--------
-gitlink:git-applymbox[1], gitlink:git-applypatch[1].
+gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
Author