Adam Goldsmith 7a4173ee13 Set default pull strategy to ff-only, because git 2.27 complains if unset ... Rebase won't let you pull with unstaged changes, and I rarely want to make a merge commit		2020-06-02 13:20:57 -04:00
.bin	initial commit, moving to git	2015-04-25 21:51:54 -04:00
.config/git	Set default pull strategy to ff-only, because git 2.27 complains if unset	2020-06-02 13:20:57 -04:00
.gitattributes	Use gpg diff for this repo	2017-09-02 14:20:42 -04:00
.netrc.gpg	Update heroku token, I guess	2018-11-09 12:17:43 -05:00