Improve configs

This commit is contained in:
Tobias Reisinger 2022-10-22 00:58:24 +02:00
parent 91c7ebd467
commit e0b2cc16fb
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
7 changed files with 63 additions and 35 deletions
.config/git

View file

@ -1,54 +1,55 @@
[user]
email = tobias@msrg.cc
name = Tobias Reisinger
signingkey = 723B78C0BF8D8C721D2C4EEF41E544A54E2533B2
email = tobias@msrg.cc
name = Tobias Reisinger
signingkey = 723B78C0BF8D8C721D2C4EEF41E544A54E2533B2
[core]
excludesfile = ~/.config/git/ignore
editor = vim
pager = less
autocrlf = input
excludesfile = ~/.config/git/ignore
editor = vim
pager = less
autocrlf = input
[help]
autocorrect = 20
autocorrect = 20
[diff]
tool = vimdiff
tool = vimdiff
[difftool]
prompt = false
prompt = false
trustExitCode = true
[alias]
b = branch -vv
ci = commit
cia = commit --amend
d = diff
dc = diff --cached
ds = diff --stat
dt = difftool
dtc = difftool --cached
l = log --graph
b = branch -vv
ci = commit
cia = commit -C HEAD --amend
d = diff
dc = diff --cached
ds = diff --stat
dw = diff --word-diff=color
dt = difftool
dtc = difftool --cached
l = log --graph
lo = log --graph --decorate --oneline --all
s = status
[merge]
tool = vim_mergetool
conflictstyle = diff3
tool = vim_mergetool
conflictstyle = diff3
[mergetool "vim_mergetool"]
cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true
cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true
[credential]
helper = /usr/bin/pass-git-helper
helper = /usr/bin/pass-git-helper
[sendemail]
smtpserver = mail.serguzim.me
smtpuser = tobias@msrg.cc
smtpencryption = tls
smtpserverport = 587
annotate = yes
smtpserver = mail.serguzim.me
smtpuser = tobias@msrg.cc
smtpencryption = tls
smtpserverport = 587
annotate = yes
[advice]
addIgnoredFile = false
addIgnoredFile = false
[pull]
ff = only
ff = only
[push]
followTags = true
followTags = true
[format]
signOff = yes
signOff = yes
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process