diff --git a/.gitconfig b/.gitconfig index ea17e64..8992af8 100644 --- a/.gitconfig +++ b/.gitconfig @@ -63,3 +63,7 @@ [merge] tool = vimdiff conflictstyle = diff3 +[pull] + rebase = true +[diff] + colorMoved = zebra