diff --git a/.gitconfig b/.gitconfig index 550a453..1eee9ed 100644 --- a/.gitconfig +++ b/.gitconfig @@ -15,6 +15,9 @@ conflictstyle = diff3 prompt = false +[pull] + rebase = false + [color] branch = auto diff = auto