From 532ee225f1b14f16aac749c4697a4f390f48d91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 17 Oct 2020 13:38:56 +0100 Subject: [PATCH] set default on git pull --- nixos/git/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/git/home.nix b/nixos/git/home.nix index 05c90d53..5a94d6d0 100644 --- a/nixos/git/home.nix +++ b/nixos/git/home.nix @@ -13,6 +13,7 @@ colour.ui = true; help.autocorrect = 1; push.default = "simple"; + pull.ff = "only"; mergetool.keepBackup = false; }; aliases =