]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rs/grep-no-no-or'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Sep 2023 20:53:13 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Sep 2023 20:53:13 +0000 (13:53 -0700)
"git grep -e A --no-or -e B" is accepted, even though the negation
of "or" did not mean anything, which has been tightened.

* rs/grep-no-no-or:
  grep: reject --no-or

1  2 
builtin/grep.c

diff --cc builtin/grep.c
Simple merge