We're not stuck with it forever, for instance 1.8.0 says:
> "git branch --set-upstream" is deprecated and may be removed in a
> relatively distant future. "git branch [-u|--set-upstream-to]" has
> been introduced with a saner order of arguments.
That particular one has caught me out a few times.