X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-am.txt;h=02cabc935e854c2a8b67481588e3e4ed6b853baa;hb=3397f9df53092871de2c33c143f1f4413654c40d;hp=1ceed112f218a3cecc7a5f9be98bd9611f7267dd;hpb=069b20a198f171512a1d2d2163b40f70c94f5257;p=git.git
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 1ceed112..02cabc93 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -8,6 +8,7 @@ git-am - Apply a series of patches in a mailbox
SYNOPSIS
--------
+[verse]
'git-am' [--signoff] [--dotest=
] [--utf8] [--binary] [--3way] ...
'git-am' [--skip | --resolved]
@@ -28,7 +29,7 @@ OPTIONS
area to store extracted patches.
--utf8, --keep::
- Pass `--utf8` and `--keep` flags to `git-mailinfo` (see
+ Pass `-u` and `-k` flags to `git-mailinfo` (see
gitlink:git-mailinfo[1]).
--binary::
@@ -69,7 +70,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,