add merge tool, change pull algo

home/git.nix

@@ -15,7 +15,8 @@
     extraConfig = {
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      pull.rebase = true;
+      pull.merge = true;
+      merge.tool = "nvimdiff";
     };
 
     ignores = [
@@ -39,7 +40,7 @@
       dc = "diff --cached";
       amend = "commit --amend -m";
 
-      # aliases for submodule
+      # aliases for submodules
       update = "submodule update --init --recursive";
       foreach = "submodule foreach";
     };