From 460efcbed034c016d00a7c4369d81e5c822e820b Mon Sep 17 00:00:00 2001 From: Francis Hamel <36383308+francishamel@users.noreply.github.com> Date: Sat, 14 Dec 2024 00:12:48 -0500 Subject: [PATCH] Always setup remote on push + always use force if includes This ensures safer force pushing --- home-manager/modules/git.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index 451a63b..909d6e2 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -20,6 +20,10 @@ init.defaultBranch = "main"; merge.conflictstyle = "zdiff3"; pull.rebase = true; + push = { + autoSetupRemote = true; + useForceIfIncludes = true; + }; rebase = { autoStash = true; autosquash = true;