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

try using delta

Browse Source
This commit is contained in:
Joel Beckmeyer 2024-11-13 11:19:24 -05:00
parent b8f053d270
commit 9484efa16d
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dot_config/git/config
View File

@ -1,3 +1,7 @@
[core]
autocrlf = input
safecrlf = true
pager = delta
[user] [user]
email = joel@beckmeyer.us email = joel@beckmeyer.us
name = Joel Beckmeyer name = Joel Beckmeyer
@ -11,6 +15,7 @@
minRacyThreshold = 6379 microseconds minRacyThreshold = 6379 microseconds
[merge] [merge]
tool = meld tool = meld
conflictstyle = zdiff3
[review "review.lineageos.org"] [review "review.lineageos.org"]
username = jbeckmeyer username = jbeckmeyer
[filter "lfs"] [filter "lfs"]
@ -20,6 +25,7 @@
required = true required = true
[pull] [pull]
rebase = false rebase = false
[core] [interactive]
autocrlf = input diffFilter = delta --color-only
safecrlf = true [delta]
navigate = true # use n and N to move between diff sections