Merge branch 'jc/parse-options-reset'
commite672bc4f76754ff6e39d09a84cb4544e193c96e5
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jul 2023 22:26:37 +0000 (27 15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jul 2023 22:26:37 +0000 (27 15:26 -0700)
tree41e5e91ab7c061ee4adc59ee73963d852a2e1ef2
parentd6966f6fffc69e38dc78f3b2b199e4c8def69b3e
parent3821eb6c3dedba1c57522a1254a916f5ad0d15dc
Merge branch 'jc/parse-options-reset'

Command line parser fix.

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