Update gitconfig with better settings, especially for delta

This commit is contained in:
Jonny Barnes 2024-02-17 14:54:15 +00:00
parent 146422e4b4
commit 12dd8faba4
Signed by: jonny
SSH key fingerprint: SHA256:CTuSlns5U7qlD9jqHvtnVmfYV3Zwl2Z7WnJ4/dqOaL8

View file

@ -1,5 +1,4 @@
[alias] [alias]
# list aliases # list aliases
aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /' | sort aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /' | sort
bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d" bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d"
@ -13,19 +12,16 @@
tlog = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative tlog = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative
[apply] [apply]
# Detect whitespace errors when applying a patch # Detect whitespace errors when applying a patch
whitespace = fix whitespace = fix
[filter "lfs"] [filter "lfs"]
# git-lfs stuff # git-lfs stuff
clean = git-lfs clean %f clean = git-lfs clean %f
smudge = git-lfs smudge %f smudge = git-lfs smudge %f
required = true required = true
[gpg] [gpg]
# Use OpenSSH to sign commits/tags/etc # Use OpenSSH to sign commits/tags/etc
format = ssh format = ssh
@ -33,10 +29,12 @@
allowedSignersFile = ~/.ssh/allowed_signers allowedSignersFile = ~/.ssh/allowed_signers
[help] [help]
# Automatically correct typos in commands # Automatically correct typos in commands
autoCorrect = prompt autoCorrect = prompt
[pull]
ff = only
[core] [core]
pager = delta pager = delta
@ -44,7 +42,11 @@
diffFilter = delta --color-only diffFilter = delta --color-only
[delta] [delta]
navigate = true # use n and N to move between diff sections # use n and N to move between diff sections
navigate = true
side-by-side = true
hyperlinks = true
hyperlinks-file-link-format = "idea://open?file={path}&line={line}"
[merge] [merge]
conflictstyle = zdiff3 conflictstyle = zdiff3
@ -53,5 +55,11 @@
algorithm = histogram algorithm = histogram
colorMoved = default colorMoved = default
[tar "tar.xz"]
command = xz -c
[tar "tar.zst"]
command = zstd -T0 -c
[init] [init]
defaultBranch = main defaultBranch = main