diff --git a/git-codereview/sync.go b/git-codereview/sync.go
index db6650e..c60d04c 100644
--- a/git-codereview/sync.go
+++ b/git-codereview/sync.go
@@ -240,7 +240,7 @@
 		run("git", "reset", "--hard", "origin/"+parent)
 		_, err = cmdOutputErr("git", "merge", "--no-ff", "origin/"+branch)
 	} else {
-		_, err = cmdOutputErr("git", "merge", "origin/"+parent)
+		_, err = cmdOutputErr("git", "merge", "--no-ff", "origin/"+parent)
 	}
 
 	// Resolve codereview.cfg the right way - never take it from the merge.