1 files changed, 3 insertions, 0 deletions

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\""; };