X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-am.txt;h=a415fe24c3dbf076145cfa44a0674875e3d2f49d;hb=9755afbd9467759bb77a6e5a535791243c5b907d;hp=1ceed112f218a3cecc7a5f9be98bd9611f7267dd;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 1ceed112..a415fe24 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -28,7 +28,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 +69,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,