Revert "Support --dir-diff with Beyond Compare"

This reverts commit c565905 as it was causing issues when just a single
file is modified: You need to first click through the whole directory
structure before actually seeing the changed file.
Change "push.default" from "current" to "upstream"

This is so one can use a simpler branch name locally than what the
upstream branch name is.