git.99rst.org Git - git.git/commit

]> git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d6966f6 3821eb6)

author	Junio C Hamano <redacted>
	Thu, 27 Jul 2023 22:26:37 +0000 (15:26 -0700)
committer	Junio C Hamano <redacted>
	Thu, 27 Jul 2023 22:26:37 +0000 (15:26 -0700)
commit	e672bc4f76754ff6e39d09a84cb4544e193c96e5
tree	41e5e91ab7c061ee4adc59ee73963d852a2e1ef2	tree
parent	d6966f6fffc69e38dc78f3b2b199e4c8def69b3e	commit \| diff
parent	3821eb6c3dedba1c57522a1254a916f5ad0d15dc	commit \| diff

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

git clone https://git.99rst.org/PROJECT