aboutsummaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-21 23:24:11 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-21 23:24:11 -0700
commitc511549e0c6848f00bd19f152b8ab42261ff5d0c (patch)
treeb4986ad0c14855412ed27b69930da8d1bf20d364 /builtin-log.c
parenta797b02f3925c4a6324472e2edaf4a58d4ffc097 (diff)
parent93467ee660ed1c145fe91ee8928220be6ef9a51c (diff)
downloadgit-c511549e0c6848f00bd19f152b8ab42261ff5d0c.tar.gz
git-c511549e0c6848f00bd19f152b8ab42261ff5d0c.tar.xz
Sync with maint
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 8af55d287..c7a577259 100644
--- 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)