From 856f990a6b14bca35d4c8feb7594aa1eeb18537d Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@nullring.xyz>
Date: Thu, 5 Mar 2026 00:15:24 -0800
Subject: disallow fast forward

---
 flake.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 56f7405..c2d5703 100644
--- a/flake.nix
+++ b/flake.nix
@@ -193,7 +193,11 @@ cp -r $HOME/website_html/. $out/
         };
 
         devShells."${system}".default = with pkgs; mkShell {
-          inherit (pre-commit-check) shellHook;
+
+          shellHook = ''
+${pre-commit-check.shellHook}
+git config branch.main.mergeoptions "--no-ff"
+'';
           buildInputs = [
             deadnix
             lychee
-- 
cgit v1.3