summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-10-29 04:12:15 -0400
committerLibravatar Jeff King <peff@peff.net>2012-10-29 04:12:15 -0400
commitd2f4469b13dcd5c850058fdee4b039f07bb33142 (patch)
tree8429b77b5076d354bac240ed165d4b27c7f79ff6 /t/t7800-difftool.sh
parentMerge branch 'jl/submodule-add-by-name' (diff)
parentlog: honor grep.* configuration (diff)
downloadtgif-d2f4469b13dcd5c850058fdee4b039f07bb33142.tar.xz
Merge branch 'jc/grep-pcre-loose-ends'
"git log -F -E --grep='<ere>'" failed to use the given <ere> pattern as extended regular expression, and instead looked for the string literally. The early part of this series is a fix for it; the latter part teaches log to respect the grep.* configuration. * jc/grep-pcre-loose-ends: log: honor grep.* configuration log --grep: accept --basic-regexp and --perl-regexp log --grep: use the same helper to set -E/-F options as "git grep" revisions: initialize revs->grep_filter using grep_init() grep: move pattern-type bits support to top-level grep.[ch] grep: move the configuration parsing logic to grep.[ch] builtin/grep.c: make configuration callback more reusable
Diffstat (limited to 't/t7800-difftool.sh')
0 files changed, 0 insertions, 0 deletions