I also use `git difftool master...HEAD` to achieve the same thing nowadays