From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jul 2023 22:26:37 +0000 (-0700)
Subject: Merge branch 'jc/parse-options-reset'
X-Git-Tag: v2.42.0-rc0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e672bc4f76754ff6e39d09a84cb4544e193c96e5;p=thirdparty%2Fgit.git

Merge branch 'jc/parse-options-reset'

Command line parser fix.

* jc/parse-options-reset:
  reset: reject --no-(mixed|soft|hard|merge|keep) option
---

e672bc4f76754ff6e39d09a84cb4544e193c96e5