Use diff* with --exit-code in git-am, git-rebase and git-merge-ours