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