diff --git a/git/.gitconfig b/git/.gitconfig index 4b4b118..20dc705 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -31,3 +31,5 @@ [merge] tool = vimdiff guitool = meld +[pull] + rebase = false