diff options
Diffstat (limited to 'git-codereview/sync.go')
| -rw-r--r-- | git-codereview/sync.go | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ func cmdSyncBranch(args []string) { 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. |