2022-03-18 14:34:27 +01:00
|
|
|
# -*- indent-tabs-mode: t -*-
|
|
|
|
|
[user]
|
|
|
|
|
email = tastytea@tastytea.de
|
|
|
|
|
name = tastytea
|
|
|
|
|
[push]
|
|
|
|
|
default = simple
|
|
|
|
|
[diff]
|
|
|
|
|
tool = meld
|
|
|
|
|
[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]
|
2022-03-29 03:56:53 +02:00
|
|
|
pager = ( delta || diff-highlight | ( highlight-diffpatch || cat ) | less --tabs=4 -RFX )
|
2022-03-18 14:34:27 +01:00
|
|
|
[gpg]
|
|
|
|
|
format = ssh
|
|
|
|
|
[gpg "ssh"]
|
|
|
|
|
allowedSignersFile = /home/tastytea/.ssh/allowed_signers
|
2022-03-29 03:55:14 +02:00
|
|
|
[interactive]
|
2022-03-29 03:56:53 +02:00
|
|
|
diffFilter = ( delta || cat )
|
2022-03-29 03:55:14 +02:00
|
|
|
[diff]
|
2022-03-29 03:56:53 +02:00
|
|
|
colorMoved = default
|
2022-03-29 03:55:14 +02:00
|
|
|
[delta]
|
2022-03-29 03:56:53 +02:00
|
|
|
color-only = true
|
2022-03-29 03:55:14 +02:00
|
|
|
diff-highlight = true
|
2022-03-29 03:56:53 +02:00
|
|
|
[user]
|
|
|
|
|
signingkey = ~/.ssh/id_ed25519
|
|
|
|
|
[include]
|
|
|
|
|
path = config.local
|
