schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

git: push --force-if-includes as default

Browse source 
stronger protection against accidentally overwriting remote commits by
another user, especially in the face of auto-fetching git clients.
This commit is contained in:
Trolli Schmittlauch 2025-01-16 22:12:48 +01:00
parent ba88e46046
commit 67904896a2
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
home/common.nix
View file

@ -44,6 +44,7 @@
extraConfig = { extraConfig = {
credential.helper = "cache"; credential.helper = "cache";
push.default = "simple"; push.default = "simple";
push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background
init.defaultBranch = "mainline"; init.defaultBranch = "mainline";
diff.tool = "vimdiff"; diff.tool = "vimdiff";
merge.tool = "vimdiff"; merge.tool = "vimdiff";