From 1af6d5bfcc139ebaffe96a2c7de17a966459022c Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Sun, 7 Mar 2021 15:56:31 -0500 Subject: [PATCH] Set default pull strategy --- gitconfig.local | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitconfig.local b/gitconfig.local index 5310c02..cced150 100644 --- a/gitconfig.local +++ b/gitconfig.local @@ -19,3 +19,5 @@ ksdiff = difftool -yt Kaleidoscope [tig] status-show-untracked-files = yes +[pull] + rebase = false