diff --git a/src/cmds/git/git.rs b/src/cmds/git/git.rs
index 6f42d20e8..5140244e6 100644
--- a/src/cmds/git/git.rs
+++ b/src/cmds/git/git.rs
@@ -522,8 +522,9 @@ fn run_log(
     // Only add --no-merges if user didn't explicitly request merge commits
     let wants_merges = args
         .iter()
-        .any(|arg| arg == "--merges" || arg == "--min-parents=2");
-    if !wants_merges {
+        .any(|arg| arg == "--merges" || arg == "--min-parents=2" || arg == "--no-merges");
+    // Don't add --no-merges if user explicitly requested merges or an exact count (-n N / --max-count)
+    if !wants_merges && !has_limit_flag {
         cmd.arg("--no-merges");
     }