X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-log.c;h=db1912a05be425d1f4430aafee5f2bca844dd104;hb=3f69d405d749742945afd462bff6541604ecd420;hp=cdcf49e21ff72b8422c12e32c1b6fddeed77ba08;hpb=add5c8a562fc0e80ad4eb3d1e2a9f9f47df053a6;p=git.git diff --git a/builtin-log.c b/builtin-log.c index cdcf49e2..db1912a0 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -203,7 +203,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp) if (start_number < 0) start_number = 1; - if (numbered && keep_subject < 0) + if (numbered && keep_subject) die ("-n and -k are mutually exclusive."); argc = setup_revisions(argc, argv, &rev, "HEAD");