Skip to content

Commit

Permalink
Always setup remote on push + always use force if includes
Browse files Browse the repository at this point in the history
This ensures safer force pushing
  • Loading branch information
francishamel committed Dec 14, 2024
1 parent a151939 commit 460efcb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions home-manager/modules/git.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
init.defaultBranch = "main";
merge.conflictstyle = "zdiff3";
pull.rebase = true;
push = {
autoSetupRemote = true;
useForceIfIncludes = true;
};
rebase = {
autoStash = true;
autosquash = true;
Expand Down

0 comments on commit 460efcb

Please sign in to comment.