1
0
Fork 0

git: Clean up config a bit

This commit is contained in:
tastytea 2022-03-29 04:16:40 +02:00
parent 38863668dc
commit b1282d69b4
Signed by: tastytea
SSH Key Fingerprint: SHA256:FBkvrOlhq5use1XEttyUGT4bUTDVA1ar9SgIc9P03cM
1 changed files with 17 additions and 19 deletions

View File

@ -2,52 +2,50 @@
[user]
email = tastytea@tastytea.de
name = tastytea
signingkey = ~/.ssh/id_ed25519
[init]
templateDir = /home/tastytea/.config/git/template
defaultBranch = main
[gpg]
format = ssh
[gpg "ssh"]
allowedSignersFile = /home/tastytea/.ssh/allowed_signers
[push]
default = simple
[diff]
tool = meld
[pull]
rebase = true
[merge]
tool = meld
conflictStyle = diff3
[merge "keywords"]
name = KEYWORDS merge driver
driver = merge-driver-ekeyword %O %A %B %P
[init]
templateDir = /home/tastytea/.config/git/template
defaultBranch = main
[commit]
gpgSign = true
[tag]
gpgSign = true
[github]
user = tastytea
[gitea "schlomp.space/api/v1"]
user = tastytea
[gitlab]
user = tastytea
[log]
date = iso
showSignature = false
[pull]
rebase = true
[alias]
tree = log --graph --decorate --pretty='format:%h %cs %s %d' --abbrev-commit
last-branches = for-each-ref --sort=-committerdate refs/heads/ --format='%(refname:short)' --count=5
review = log --patch --reverse
[core]
pager = ( delta || diff-highlight | ( highlight-diffpatch || cat ) | less --tabs=4 -RFX )
[gpg]
format = ssh
[gpg "ssh"]
allowedSignersFile = /home/tastytea/.ssh/allowed_signers
[interactive]
diffFilter = ( delta || cat )
[diff]
colorMoved = default
tool = meld
[delta]
color-only = true
diff-highlight = true
[user]
signingkey = ~/.ssh/id_ed25519
[github]
user = tastytea
[gitea "schlomp.space/api/v1"]
user = tastytea
[gitlab]
user = tastytea
[include]
path = config.local