diff --git a/home/programs/git.nix b/home/programs/git.nix index b8c9174..8f11015 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -29,7 +29,10 @@ in fetch.prune = true; init.defaultBranch = "main"; merge.conflictstyle = "zdiff3"; - push.autoSetupRemote = true; + push = { + default = "current"; + autoSetupRemote = true; + }; pull.ff = "only"; }; ignores = [ "/.nix" "/.direnv" ];