Merge branch 'unstable'

1 files changed, 5 insertions, 1 deletions

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