diff --git a/git/gitconfig.j2 b/git/gitconfig.j2 index 13d777a..e1698d7 100644 --- a/git/gitconfig.j2 +++ b/git/gitconfig.j2 @@ -66,7 +66,7 @@ [column] ui = auto [push] - default = simple + default = upstream [merge] tool = vimdiff [gc]