diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-02 14:18:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-02 14:18:20 -0700 |
| commit | 8132f2c44dc903e704146361138ccd7c672ec9e2 (patch) | |
| tree | 91e569345923ca132f9846565444ba3f1ba1afee /git-rebase--merge.sh | |
| parent | 6b869a1eeb4b5b198e7bd3e061d5b33ef84da115 (diff) | |
| parent | e4aab50475c1d384e016c6ac6548635f1ddcd3fe (diff) | |
| download | git-8132f2c44dc903e704146361138ccd7c672ec9e2.tar.gz git-8132f2c44dc903e704146361138ccd7c672ec9e2.tar.xz | |
Merge branch 'rs/pickaxe-i'
Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
to be used together and work as expected to perform a pickaxe
search using case-insensitive regular expression matching.
* rs/pickaxe-i:
pickaxe: simplify kwset loop in contains()
pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
pickaxe: move pickaxe() after pickaxe_match()
pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
pickaxe: honor -i when used with -S and --pickaxe-regex
t4209: use helper functions to test --author
t4209: use helper functions to test --grep
t4209: factor out helper function test_log_icase()
t4209: factor out helper function test_log()
t4209: set up expectations up front
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions