git-apply: notice "diff --git" patch again