Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index b9c6fac7483dbefba0afb60a76ac0362aa390a6d..efd311b1ceec1653281441b232da04decd122bc3 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -11,7 +11,8 @@ SYNOPSIS
 [verse]
 'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
         [--3way] [--interactive]
-         [--whitespace=<option>] [-C<n>] [-p<n>]
+        [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
+        [--reject]
         [<mbox> | <Maildir>...]
 'git am' (--skip | --resolved | --abort)
 
@@ -60,12 +61,10 @@ default.   You could use `--no-utf8` to override this.
        available locally.
 
 --whitespace=<option>::
-       This flag is passed to the 'git-apply' (see linkgit:git-apply[1])
-       program that applies
-       the patch.
-
 -C<n>::
 -p<n>::
+--directory=<dir>::
+--reject::
        These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
        program that applies
        the patch.