From 1cece9eaa6e19a84d0a4c72235ef8534637bae0f Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 19 May 2021 21:35:18 +0200
Subject: git: set pull to ff-only by default

---
 common/commandline/git.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'common/commandline')

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index e231356..914cdb4 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -21,6 +21,9 @@ inputs:
             pager = deltaCommand;
             interactive.diffFilter = "${deltaCommand} --color-only";
           };
+
+          pull.ff = "only";
+
           merge = { tool = "nvimdiff"; };
           "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; };
 
-- 
cgit v1.2.3