updated alias for difftool as well as default behaviour for push