feat: minor work tweaks

This commit is contained in:
Max Hohlfeld 2025-03-12 08:21:07 +01:00
parent db41615adf
commit 16247e2a61
2 changed files with 17 additions and 5 deletions

View File

@ -9,14 +9,25 @@
autoSetupRemote = true
[interactive]
diffFilter = delta --color-only
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
navigate = true
dark = true
[merge]
conflictstyle = diff3
conflictstyle = zdiff3
[diff]
colorMoved = default
algorithm = histogram
colorMoved = default
mnemonicPrefix = true
renames = true
[init]
defaultBranch = master
[fetch]
prune = true
pruneTags = true
all = true

View File

@ -28,6 +28,7 @@ alias gr='git reset'
alias grm='git rm'
alias lg='lazygit'
alias fxc='xclip -o -selection clipboard | fx'
# starting ssh-agent
if [ -z "$SSH_AUTH_SOCK" ] ; then