From 67904896a2797276b82202516f12e23550bd0cd3 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Thu, 16 Jan 2025 22:12:48 +0100
Subject: [PATCH] git: push --force-if-includes as default

stronger protection against accidentally overwriting remote commits by
another user, especially in the face of auto-fetching git clients.
---
 home/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/common.nix b/home/common.nix
index 657bb57..e38801a 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -44,6 +44,7 @@
     extraConfig = {
       credential.helper = "cache";
       push.default = "simple";
+      push.forceIfIncludes = true;  # avoid accidental force overrides when remote is autofetched in background
       init.defaultBranch = "mainline";
       diff.tool = "vimdiff";
       merge.tool = "vimdiff";