diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:28 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:28 +0900 |
commit | 2cfab6087790ceeb81eb91eeb1300500cfa4c948 (patch) | |
tree | 12b60cadde36404d455a1adc53bc626af4704565 /t/t5536-fetch-conflicts.sh | |
parent | Merge branch 'dl/branch-from-3dot-merge-base' (diff) | |
parent | parse-options: don't emit "ambiguous option" for aliases (diff) | |
download | tgif-2cfab6087790ceeb81eb91eeb1300500cfa4c948.tar.xz |
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
Diffstat (limited to 't/t5536-fetch-conflicts.sh')
0 files changed, 0 insertions, 0 deletions