aboutsummaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-28 09:23:29 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-28 09:23:29 -0700
commit63b398a428c5294819a70d9c56879e7fac62a523 (patch)
treec67f8c332fc265c0a02bfb4fcf989baa2b0f131d /builtin-log.c
parentb931aa5a48f9fb3c26a565d5f19866923f13b692 (diff)
downloadgit-63b398a428c5294819a70d9c56879e7fac62a523.tar.gz
git-63b398a428c5294819a70d9c56879e7fac62a523.tar.xz
format-patch: -n and -k are mutually exclusive.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c
index cdcf49e21..db1912a05 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");