]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a4ae43 aae8558)
Merge branch 'rs/grep-no-no-or' into maint-2.42
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Nov 2023 07:53:17 +0000 (16:53 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Nov 2023 07:53:18 +0000 (16:53 +0900)
"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 patch | diff1 | diff2 | blob | history

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