From 1ba1b9e5ca44917782fd5bef28ee26a7ab19e268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 1 Apr 2022 22:21:54 +0100 Subject: [PATCH] re-sort git options --- nixos/git/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/git/home.nix b/nixos/git/home.nix index 199c26ff..d0f7fcab 100644 --- a/nixos/git/home.nix +++ b/nixos/git/home.nix @@ -15,9 +15,9 @@ colour.ui = true; credential = { helper = "cache"; }; diff.algorithm = "histogram"; + diff.external = "${pkgs.difftastic}/bin/difftastic $LOCAL $REMOTE"; diff.renameLimit = 2048; diff.renames = "copy"; - diff.external = "${pkgs.difftastic}/bin/difftastic $LOCAL $REMOTE"; help.autocorrect = 1; merge.renamelimit = 8192; mergetool.keepBackup = false;