summaryrefslogtreecommitdiff
path: root/git-rebase--preserve-merges.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-13 16:52:53 -0700
committerJunio C Hamano <gitster@pobox.com>2021-07-13 16:52:53 -0700
commit1157618a2ae50ae611ca22ce1833760bc0456156 (patch)
tree7e0a1cbd4401c16d93a82981a385726655cc052c /git-rebase--preserve-merges.sh
parent21ef7ee4d6104c35fc6753da5406c842fb2d9286 (diff)
parentfe7fe62d8da0949d9b2bca34467b349bd294e91b (diff)
downloadgit-1157618a2ae50ae611ca22ce1833760bc0456156.tar.gz
Merge branch 'rs/grep-parser-fix'
"git grep --and -e foo" ought to have been diagnosed as an error but instead segfaulted, which has been corrected. * rs/grep-parser-fix: grep: report missing left operand of --and
Diffstat (limited to 'git-rebase--preserve-merges.sh')
0 files changed, 0 insertions, 0 deletions