Sync with maint

diff --git a/builtin-log.c b/builtin-log.c
index 8af55d28793ae1fb7180198fb4f63eb7783c6335..c7a57725948553a955f49ab891aed3fbdd3aa33d 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -958,8 +958,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                die ("-n and -k are mutually exclusive.");
        if (keep_subject && subject_prefix)
                die ("--subject-prefix and -k are mutually exclusive.");
-       if (numbered_files && use_stdout)
-               die ("--numbered-files and --stdout are mutually exclusive.");
 
        argc = setup_revisions(argc, argv, &rev, "HEAD");
        if (argc > 1)