]> git.ipfire.org Git - thirdparty/git.git/commit - t/t1507-rev-parse-upstream.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit17ab51ee8ffcecc62813fe6c744cabb924f3fc9f
tree8a97eb3d423eea04fe31c009faf65e3394181b00tree | snapshot
parent9a4ae43f0bbdf1b36d40ba9d0efb8d1bc8a9ce4dcommit | diff
parentaae8558b1038de452acee672dffca30339f65fa9commit | diff
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
builtin/grep.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.