diff --git a/dot_config/git/private_config.tmpl b/dot_config/git/private_config.tmpl index db2f0d4..6c2409e 100644 --- a/dot_config/git/private_config.tmpl +++ b/dot_config/git/private_config.tmpl @@ -75,7 +75,7 @@ [merge] conflictstyle = diff3 [pull] - rebase = false + rebase = true [init] defaultBranch = master [advice]