Junio C Hamano wrote:
I am debating myself if it is truly easier to explain for users that
"-G" is a different variant of pickaxe.
Hm, I think it is the correct approach because readers of diffcore are
probably going to look at the source: it's not exactly an end-user
manpage. I've not explained it as G king versus S kind in the
diff-options documentation.
Or are you just talking about the error message? That's simple:
--pickaxe-regex is what triggers this off, and we've made it clear
that it applies to both commands (-G implicitly; see doc).