What that doesn't give you is the ability to say "git <git-options> diff <git-diff-options>", which is very nice and makes the inconsistencies I just posted on less likely.  Fortunately, any getopt-variant can deal with these; you just have to pass the tail of argv and a suitably reduced value for argc to another call of the options parser.