Merge branch 'jc/parse-options-reset'

Command line parser fix. * jc/parse-options-reset: reset: reject --no-(mixed|soft|hard|merge|keep) option

Junio C Hamano committed Jul 27, 2023 at 15:26 UTC e672bc4f76754ff6e39d09a84cb4544e193c96e5

No changes.