Merge branch 'master' into next

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 493cac22dbe16dd5bdb9eed8f91f93ea184fa622..4ca0014dac64729bee11b6a37bd730b538b2e5ee 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -40,8 +40,7 @@ OPTIONS
 -------
 -o|--output-directory <dir>::
        Use <dir> to store the resulting files, instead of the
-       current working directory. This option is ignored if
-       --stdout is specified.
+       current working directory.
 
 -n|--numbered::
        Name output in '[PATCH n/m]' format.