diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index 60e36f1..909d6e2 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -16,12 +16,18 @@ }; enable = true; extraConfig = { + fetch.prune = true; init.defaultBranch = "main"; merge.conflictstyle = "zdiff3"; pull.rebase = true; + push = { + autoSetupRemote = true; + useForceIfIncludes = true; + }; rebase = { autoStash = true; autosquash = true; + updateRefs = true; }; rerere.enabled = true; };