84 lines
2.3 KiB
Text
84 lines
2.3 KiB
Text
[core]
|
|
pager = delta
|
|
[delta]
|
|
# https://dandavison.github.io/delta/configuration.html
|
|
hyperlinks = true
|
|
line-numbers = true
|
|
navigate = true
|
|
syntax-theme = Solarized (dark)
|
|
[diff]
|
|
colorMoved = default
|
|
tool = vimdiff
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
[color]
|
|
ui = true
|
|
branch = always
|
|
status = always
|
|
interactive = always
|
|
diff = true
|
|
[color "branch"]
|
|
current = 3 reverse
|
|
local = 3
|
|
remote = 2
|
|
[color "diff"]
|
|
frag = 5 bold
|
|
meta = 3 bold
|
|
new = 2 bold
|
|
old = 1 bold
|
|
whitespace = 1 reverse
|
|
[color "status"]
|
|
added = 11 bold
|
|
changed = 2 bold
|
|
untracked = 4 bold
|
|
[status]
|
|
short = true
|
|
branch = true
|
|
[user]
|
|
name = Maximilian Friedersdorff
|
|
email = "max@gwairfelin.com"
|
|
[includeIf "gitdir:~/src/esl/"]
|
|
path = /home/max/.config/git/config-esl
|
|
[merge]
|
|
conflictStyle = zdiff3
|
|
ff = false
|
|
tool = vimdiff
|
|
[mergetool "vimdiff"]
|
|
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
|
[push]
|
|
default = simple
|
|
[alias]
|
|
lg = log --graph --pretty=format:'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short
|
|
hist = log --graph --full-history --all --pretty=format:'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short
|
|
struct = log --graph --full-history --all --pretty=format:'%ad %s %Creset %C(yellow)%d%Creset' --date=short --simplify-by-decoration
|
|
co = checkout
|
|
c = commit
|
|
s = status
|
|
d = diff
|
|
pub = flow publish
|
|
commit = commit -S
|
|
vt = tag -v
|
|
tag = tag -s
|
|
t = tag -s
|
|
alias = "!req=$'\\033[0;31m=\\033[0m'; git config --get-regexp ^alias\\. | sed -e s/^alias\\.// -e \"s/\\ /\t$req\\ /\""
|
|
pa = !git remote | xargs -L1 git push --all
|
|
fi = flow finish --push --no-ff
|
|
changes = "!git log $(git tag -l --sort=taggerdate | tail -n 1)..HEAD --pretty=format:'* %s' --no-merges --reverse"
|
|
this = rev-parse --abbrev-ref HEAD
|
|
[pull]
|
|
rebase = false
|
|
ff = true
|
|
[sendemail]
|
|
smtpserver = mail.friedersdorff.com
|
|
smtpuser = max
|
|
smtpencryption = tls
|
|
smtpserverport = 587
|
|
[help]
|
|
autoCorrect = immediate
|
|
[init]
|
|
defaultBranch = main
|
|
[filter "lfs"]
|
|
process = git-lfs filter-process
|
|
required = true
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|