diff --git a/.gitconfig b/.gitconfig index ca0ed678..9a052718 100644 --- a/.gitconfig +++ b/.gitconfig @@ -29,6 +29,8 @@ blame = diff-so-fancy | less --tabs=4 -RFX [diff] colorMoved = default +[pull] + rebase = false [commit] gpgsign = true [gpg]