diff --git a/git-codereview/sync.go b/git-codereview/sync.go
index b079c84..2d93bcb 100644
--- a/git-codereview/sync.go
+++ b/git-codereview/sync.go
@@ -125,7 +125,8 @@
 }
 
 func cmdSyncBranch(args []string) {
-	os.Setenv("GIT_EDITOR", ":") // do not bring up editor during merge, commit
+	os.Setenv("GIT_EDITOR", ":")       // do not bring up editor during merge, commit
+	os.Setenv("GIT_GOFMT_HOOK", "off") // do not require gofmt during merge
 
 	var cont, mergeBackToParent bool
 	flags.BoolVar(&cont, "continue", false, "continue after merge conflicts")