pierre/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(git): use difftastic by default

Browse Source
This commit is contained in:
Pierre Martin
2024-06-21 05:31:42 +02:00
parent 1c7d38bf3d
commit 1c7c8cbf55
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages.nix
View File

@@ -81,6 +81,7 @@
meld meld
glab glab
sapling sapling
difftastic
firefox firefox
vivaldi vivaldi

1
programs/git.nix
View File

@@ -37,6 +37,7 @@
diff.colorMoved = "default"; diff.colorMoved = "default";
merge.tool = "meld"; merge.tool = "meld";
diff.external = "difft";
diff.algorithm = "patience"; diff.algorithm = "patience";
pull.ff = "only"; pull.ff = "only";
credential.helper = "store"; credential.helper = "store";