danielsiepmann/nixpkgs
danielsiepmann/nixpkgs
1
0
Code Releases Activity

Improve git diffs

Browse source 
Use 3 way annotation within files.
Use other algorithm.
This commit is contained in:
Daniel Siepmann 2024-02-28 08:37:10 +01:00
parent 1033fec278
commit 5b7d998df1
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
home/programs/git.nix
View file

@ -94,10 +94,11 @@
whitespace = "-blank-at-eol,-space-before-tab,-indent-with-non-tab,-tab-in-indent,-blank-at-eof,-trailing-space-,cr-at-eol";
};
# Not possible right now, due to: https://github.com/gitonomy/gitlib/issues/114 for onw customer project
# diff = {
# noprefix = true;
# };
diff = {
# Not possible right now, due to: https://github.com/gitonomy/gitlib/issues/114 for own customer project
# noprefix = true;
algorithm = "histogram";
};
pager = {
branch = false;
@ -133,6 +134,7 @@
merge = {
ff = true;
conflictstyle = "zdiff3";
tool = "nvimdiff4";
};