From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 May 2019 07:45:28 +0000 (+0900)
Subject: Merge branch 'nd/parse-options-aliases'
X-Git-Tag: v2.22.0-rc1~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cfab6087790ceeb81eb91eeb1300500cfa4c948?hp=--cc

Merge branch 'nd/parse-options-aliases'

Attempt to use an abbreviated option in "git clone --recurs" is
responded by a request to disambiguate between --recursive and
--recurse-submodules, which is bad because these two are synonyms.
The parse-options API has been extended to define such synonyms
more easily and not produce an unnecessary failure.

* nd/parse-options-aliases:
parse-options: don't emit "ambiguous option" for aliases
---

2cfab6087790ceeb81eb91eeb1300500cfa4c948