45 lines
949 B
Plaintext
45 lines
949 B
Plaintext
|
# -*- 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]
|
||
|
pager = diff-highlight | less --tabs=4 -RFX
|
||
|
[gpg]
|
||
|
format = ssh
|
||
|
[gpg "ssh"]
|
||
|
allowedSignersFile = /home/tastytea/.ssh/allowed_signers
|
||
|
[include]
|
||
|
path = config.local
|