From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Jul 2021 20:18:03 +0000 (-0700)
Subject: Merge branch 'pb/dont-complete-aliased-options'
X-Git-Tag: v2.33.0-rc0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa8b225d864e00703c048d49ff523c3980d6a3b4;p=thirdparty%2Fgit.git

Merge branch 'pb/dont-complete-aliased-options'

The completion support used to offer alternate spelling of options
that exist only for compatibility, which has been corrected.

* pb/dont-complete-aliased-options:
  parse-options: don't complete option aliases by default
---

fa8b225d864e00703c048d49ff523c3980d6a3b4