summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: acb7257)
raw | patch | inline | side by side (parent: acb7257)
author | Junio C Hamano <junkio@cox.net> | |
Tue, 28 Mar 2006 08:04:50 +0000 (00:04 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 28 Mar 2006 08:04:50 +0000 (00:04 -0800) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
revision.c | patch | blob | history |
diff --git a/revision.c b/revision.c
index d67718c75beecb2d411eb5cd4b051cbe0a274939..d7678cfab4b18082bacee706cb119018b39643a0 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -587,7 +587,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->remove_empty_trees = 1;
continue;
}
- if (!strncmp(arg, "--no-merges", 11)) {
+ if (!strcmp(arg, "--no-merges")) {
revs->no_merges = 1;
continue;
}