feat(git): dont automatically merge on pull

2026-03-16 10:11:08 +01:00 · 2020-10-30 08:08:20 +01:00
parent 394615168d
commit 0be0356005
1 changed files with 1 additions and 0 deletions
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -71,6 +71,7 @@
      };
      ignores = config.niveum.ignore;
      extraConfig = {
+        pull.ff = "only";
        core.pager =
          "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX";
        color = {