diff --git a/apps/git/config b/apps/git/config index 5a8bc8f..e9551d9 100644 --- a/apps/git/config +++ b/apps/git/config @@ -29,4 +29,7 @@ prompt = false [mergetool "nvimdiff"] - cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' + +[push] + default = current