diff --git a/.gitconfig b/.gitconfig index dcd20db..40a89c8 100644 --- a/.gitconfig +++ b/.gitconfig @@ -14,6 +14,8 @@ preloadindex = yes [merge] tool = vimdiff +[pull] + rebase = true [push] default = matching #