Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-21 23:24:11 -07:00
parent a797b02f39 93467ee660
commit c511549e0c
4 changed files with 35 additions and 22 deletions
--- 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)