diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-05 14:06:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-05 14:06:26 -0700 |
| commit | 9b6891f651ad51913419ee9184280a321b41e9ce (patch) | |
| tree | f974c90a08847c5ff1eae393002823bd7aba24b2 /diff.c | |
| parent | 34c5a9e284c88d415559586b79487411ece6f69c (diff) | |
| parent | 46b8dec038be1125153e9fc816a1e1f0a9d2de77 (diff) | |
| download | git-9b6891f651ad51913419ee9184280a321b41e9ce.tar.gz | |
Merge branch 'pb/regex'
* pb/regex:
On some platforms, certain headers need to be included before regex.h
Support for pickaxe matching regular expressions
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -883,6 +883,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) options->filter = arg + 14; else if (!strcmp(arg, "--pickaxe-all")) options->pickaxe_opts = DIFF_PICKAXE_ALL; + else if (!strcmp(arg, "--pickaxe-regex")) + options->pickaxe_opts = DIFF_PICKAXE_REGEX; else if (!strncmp(arg, "-B", 2)) { if ((options->break_opt = diff_scoreopt_parse(arg)) == -1) |