Merge branch 'maint-1.6.1' into maint

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 1f577b8016156871debcbb17fc32af9f7a6082f4..3c29655d753902facf7f356dd30b1783ec96660e 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -92,7 +92,6 @@ include::diff-options.txt[]
 --numbered-files::
        Output file names will be a simple number sequence
        without the default first line of the commit appended.
-       Mutually exclusive with the --stdout option.
 
 -k::
 --keep-subject::