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

54
dot_config/git/config
View File

@ -1,25 +1,31 @@
[user]
email = joel@beckmeyer.us
name = Joel Beckmeyer
[color]
ui = auto
[push]
default = current
autoSetupRemote = true
[filesystem "N/A|13.0.2|/dev/sda2"]
timestampResolution = 10000 nanoseconds
minRacyThreshold = 6379 microseconds
[merge]
tool = meld
[review "review.lineageos.org"]
username = jbeckmeyer
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[pull]
rebase = false
[core] [core]
autocrlf = input autocrlf = input
safecrlf = true safecrlf = true
pager = delta
[user]
email = joel@beckmeyer.us
name = Joel Beckmeyer
[color]
ui = auto
[push]
default = current
autoSetupRemote = true
[filesystem "N/A|13.0.2|/dev/sda2"]
timestampResolution = 10000 nanoseconds
minRacyThreshold = 6379 microseconds
[merge]
tool = meld
conflictstyle = zdiff3
[review "review.lineageos.org"]
username = jbeckmeyer
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[pull]
rebase = false
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections