projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/gitk/gitk
[git.git]
/
builtin-log.c
diff --git
a/builtin-log.c
b/builtin-log.c
index
cdcf49e
..
db1912a
100644
(file)
--- 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");