about summary refs log tree commit
path: root/builtin/log.c
diff options
context:
space:
mode:
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 b97373da3b..39e8836352 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *
                 /* There was no "-m" on the command line */
                 rev->ignore_merges = 0;
                 if (!rev->first_parent_only && !rev->combine_merges) {
-                        /* No "--first-parent", "-c", nor "--cc" */
+                        /* No "--first-parent", "-c", or "--cc" */
                         rev->combine_merges = 1;
                         rev->dense_combined_merges = 1;
                 }