similar github-flow but use git difftool instead of pull request