]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6966f6 3821eb6)
Merge branch 'jc/parse-options-reset'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jul 2023 22:26:37 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jul 2023 22:26:37 +0000 (15:26 -0700)
Command line parser fix.

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

1  2 
builtin/reset.c patch | diff1 | diff2 | blob | history

diff --cc builtin/reset.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.