2018-07-22 19:53:14 +00:00
|
|
|
[user]
|
|
|
|
|
email = ben@tilde.team
|
|
|
|
|
name = Ben Harris
|
2018-07-24 05:06:48 +00:00
|
|
|
signingkey = FC2255B7BBC7EABD4EFAFA1068907D8BCCD85A5A
|
2018-08-15 20:06:27 +00:00
|
|
|
|
2018-07-22 19:53:14 +00:00
|
|
|
[push]
|
|
|
|
|
default = simple
|
2018-08-15 20:06:27 +00:00
|
|
|
|
2018-07-24 05:06:48 +00:00
|
|
|
[commit]
|
|
|
|
|
gpgsign = true
|
2018-08-15 20:06:27 +00:00
|
|
|
|
2018-08-11 19:03:04 +00:00
|
|
|
[pull]
|
|
|
|
|
ff = only
|
2018-08-15 20:06:27 +00:00
|
|
|
|
|
|
|
|
[diff "gpg"]
|
|
|
|
|
textconv = gpg --no-tty --decrypt
|
|
|
|
|
cachetextconv = false
|
|
|
|
|
|
|
|
|
|
[diff "ansible-vault"]
|
|
|
|
|
textconv = ansible-vault view
|
|
|
|
|
cachetextconv = false
|
|
|
|
|
|
2018-11-20 21:20:18 +00:00
|
|
|
[sendemail]
|
|
|
|
|
smtpencryption = tls
|
|
|
|
|
smtpserver = mail.tilde.team
|
|
|
|
|
smtpserverport = 587
|
|
|
|
|
annotate = yes
|
|
|
|
|
smtpuser = ben
|
2018-12-01 01:57:02 +00:00
|
|
|
[alias]
|
|
|
|
|
lol = log --oneline --graph --decorate --all
|
2019-06-17 18:06:13 +00:00
|
|
|
joke = !curl -s https://raw.githubusercontent.com/EugeneKay/git-jokes/lulz/Jokes.txt | shuf -n1
|
|
|
|
|
dad = !curl https://icanhazdadjoke.com
|
2019-06-25 01:19:32 +00:00
|
|
|
staged = diff --staged
|
|
|
|
|
ap = add --patch
|
|
|
|
|
local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD
|
|
|
|
|
upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}
|
2019-05-29 17:39:18 +00:00
|
|
|
[rerere]
|
|
|
|
|
enabled = true
|
2019-08-13 21:06:27 +00:00
|
|
|
[merge]
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
conflictstyle = diff3
|
|
|
|
|
[mergetool]
|
|
|
|
|
prompt = false
|
