From 7a4173ee13830571772569604d61dea966aea60a Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Tue, 2 Jun 2020 13:15:46 -0400 Subject: [PATCH] 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 --- .config/git/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/git/config b/.config/git/config index 65d9496..d7d166e 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,6 +1,8 @@ [user] email = adam@adamgoldsmith.name name = Adam Goldsmith +[pull] + ff = only [push] default = simple [core]