dotfiles/git
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set default pull strategy to ff-only, because git 2.27 complains if unset

Browse Source 
Rebase won't let you pull with unstaged changes, and I rarely want to
make a merge commit
This commit is contained in:
Adam Goldsmith 2020-06-02 13:15:46 -04:00
parent 6e3df114da
commit 7a4173ee13
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/git/config
View File

@ -1,6 +1,8 @@
[user] [user]
email = adam@adamgoldsmith.name email = adam@adamgoldsmith.name
name = Adam Goldsmith name = Adam Goldsmith
[pull]
ff = only
[push] [push]
default = simple default = simple
[core] [core]