feat(git): add difftool.dyff

yurrriq · Apr 29, 2024 · fc53a56 · fc53a56
1 parent 8989e8c
commit fc53a56
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.15.1
+8.16.0
diff --git a/config/git/config.nix b/config/git/config.nix
@@ -56,6 +56,7 @@
       };
 
       difftool = {
+        dyff.cmd = "dyff --color on between --omit-header \"$LOCAL\" \"$REMOTE\"";
         pdfdiffer.cmd = "diff-pdf --view \"$LOCAL\" \"$REMOTE\"";
         prompt = false;
         trustExitCode = true;

diff --git a/config/git/packages.nix b/config/git/packages.nix
@@ -4,6 +4,7 @@
   home.packages = with pkgs; (
     [
       diff-pdf
+      dyff
       git
       github-cli
       kdiff3

diff --git a/src/config/git/config.nw b/src/config/git/config.nw
@@ -59,6 +59,7 @@ Configure Git.
       };
 
       difftool = {
+        dyff.cmd = "dyff --color on between --omit-header \"$LOCAL\" \"$REMOTE\"";
         pdfdiffer.cmd = "diff-pdf --view \"$LOCAL\" \"$REMOTE\"";
         prompt = false;
         trustExitCode = true;

diff --git a/src/config/git/packages.nw b/src/config/git/packages.nw
@@ -5,6 +5,7 @@
   home.packages = with pkgs; (
     [
       diff-pdf
+      dyff
       git
       github-cli
       kdiff3
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       home.packages = with pkgs; (
         [
           diff-pdf
+          dyff
           git
           github-cli
           kdiff3
@@ Expand Down @@