git merge documentation: -m is optional

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 77ef103b21ed7c8864cf05c08efe3ae562357f55..4fb1d844133ba8350361ee67d074935805a24156 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -10,7 +10,8 @@ SYNOPSIS
 --------
 [verse]
 'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
-         [--interactive] [--whitespace=<option>] <mbox>...
+         [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>]
+        <mbox>...
 'git-am' [--skip | --resolved]
 
 DESCRIPTION
@@ -68,8 +69,8 @@ default.   You could use `--no-utf8` to override this.
        This flag is passed to the `git-apply` program that applies
        the patch.
 
--C<n>::
-       This flag is passed to the `git-apply` program that applies
+-C<n>, -p<n>::
+       These flag are passed to the `git-apply` program that applies
        the patch.
 
 --interactive::