diff --git a/home/dot_config/git/config.tmpl b/home/dot_config/git/config.tmpl index 38727c28..39963d79 100644 --- a/home/dot_config/git/config.tmpl +++ b/home/dot_config/git/config.tmpl @@ -140,6 +140,8 @@ threads = 0 [pretty] custom = "%C(magenta)%h%C(red)%d %C(yellow)%ar %C(green)%s %C(yellow)(%an)" +[pull] + rebase = false [push] autoSetupRemote = true default = upstream