diff --git a/git/gitconfig.j2 b/git/gitconfig.j2 index ec36e98..1a6e291 100644 --- a/git/gitconfig.j2 +++ b/git/gitconfig.j2 @@ -76,7 +76,7 @@ [column] ui = auto [push] - default = upstream + default = simple [merge] tool = vimdiff [gc]