From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Nov 2023 07:53:17 +0000 (+0900)
Subject: Merge branch 'rs/grep-no-no-or' into maint-2.42
X-Git-Tag: v2.42.1~39
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=17ab51ee8ffcecc62813fe6c744cabb924f3fc9f

Merge branch 'rs/grep-no-no-or' into maint-2.42

"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
---

17ab51ee8ffcecc62813fe6c744cabb924f3fc9f