Do some spring cleaning

This commit is contained in:
Andrew Tomaka 2021-11-02 20:14:26 -04:00
parent d9067797a5
commit 019f27d538
Signed by: atomaka
GPG key ID: 61209BF70A5B18BE
8 changed files with 108 additions and 114 deletions

View file

@ -37,7 +37,7 @@
attributesfile = ~/.gitattributes_global
filemode = false
[gpg]
program = gpg
program = gpg
[merge]
tool = vimdiff
[push]
@ -52,6 +52,6 @@
textconv = bundle exec rails encrypted:show
cachetextconv = false
[pull]
ff = only
rebase = false
[init]
defaultBranch = master
defaultBranch = master