Merge branch 'maint-1.6.1' into maint

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 11a7d772618f48b961d41fb5fe1cb269d7ae7cd1..dc40f471694073b8aeb77c1cbe0491d458af3891 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -96,7 +96,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::