diff --git a/defaults/git.nix b/defaults/git.nix index f1090db..95235bf 100644 --- a/defaults/git.nix +++ b/defaults/git.nix @@ -34,6 +34,8 @@ in # causing further problems pull.ff = "only"; + push.autoSetupRemote = true; + merge.conflictStyle = "zdiff3"; # easiest to understand style commit.verbose = true; # show diffs in commit editor }