diff --git a/git/gitconfig b/git/gitconfig index 7fe7287..d6c5abf 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -4,6 +4,6 @@ email = anund@gmail.com name = Anund [push] - default = simple + default = current [merge] tool = vimdiff