diff --git a/home/git.nix b/home/git.nix index 7c3504a..db30f9d 100644 --- a/home/git.nix +++ b/home/git.nix @@ -15,7 +15,7 @@ extraConfig = { init.defaultBranch = "master"; push.autoSetupRemote = true; - pull.merge = true; + pull.rebase = false; merge.tool = "nvimdiff"; mergetool.keepBackup = false; };