summaryrefslogtreecommitdiff
path: root/builtin/grep.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/no-no-no-parseopt'Junio C Hamano2012-03-011-3/+2
|\
| * parse-options: remove PARSE_OPT_NEGHELPrs/no-no-no-parseoptRené Scharfe2012-02-281-2/+2
* | Merge branch 'jk/grep-binary-attribute'Junio C Hamano2012-02-141-144/+33
|\ \
| * | grep: pre-load userdiff drivers when threadedjk/grep-binary-attributeJeff King2012-02-021-4/+6
| * | convert git-grep to use grep_source interfaceJeff King2012-02-021-119/+23
| * | grep: move sha1-reading mutex into low-level codeJeff King2012-02-021-23/+6
| * | grep: make locking flag globalJeff King2012-02-021-2/+2
* | | drop odd return value semantics from userdiff_configjk/userdiff-config-simplifyJeff King2012-02-071-5/+2
* | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-231-2/+3
|/ /
* | grep: disable threading in non-worktree casetr/grep-threadingThomas Rast2011-12-161-18/+18
* | grep: enable threading with -p and -W using lazy attribute lookupThomas Rast2011-12-161-4/+9
* | Merge branch 'nd/misc-cleanups'Junio C Hamano2011-12-051-5/+6
|\ \
| * | tree_entry_interesting(): give meaningful names to return valuesNguyễn Thái Ngọc Duy2011-10-271-4/+5
| * | tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy2011-10-271-1/+1
* | | builtin/grep: simplify lock_and_read_sha1_file()Junio C Hamano2011-10-261-7/+3
* | | builtin/grep: make lock/unlock into static inline functionsJunio C Hamano2011-10-261-5/+23
* | | git grep: be careful to use mutexes only when they are initializedJohannes Schindelin2011-10-261-4/+5
|/ /
* | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-151-1/+1
|\ \
| * | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-151-1/+1
* | | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-131-7/+17
|\ \ \ | |/ /
| * | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-041-10/+20
* | | Merge branch 'bw/grep-no-index-no-exclude'Junio C Hamano2011-10-131-3/+3
| |/ |/|
* | Merge branch 'nm/grep-object-sha1-lock'Junio C Hamano2011-10-051-0/+3
|/
* Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-281-3/+1
|\
| * want_color: automatically fallback to color.uiJeff King2011-08-191-2/+0
| * git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-181-1/+1
* | grep: long context optionsRené Scharfe2011-08-011-4/+4
* | grep: add option to show whole function as contextRené Scharfe2011-08-011-1/+4
* | grep: add --headingRené Scharfe2011-06-051-0/+2
* | grep: add --breakRené Scharfe2011-06-051-1/+3
* | grep: fix coloring of hunk marks between filesRené Scharfe2011-06-051-7/+16
|/
* Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-301-9/+43
|\
| * git-grep: do not die upon -F/-P when grep.extendedRegexp is set.Junio C Hamano2011-05-091-13/+43
| * git-grep: Bail out when -P is used with -F or -EMichał Kiedrowicz2011-05-091-1/+3
| * git-grep: Learn PCREMichał Kiedrowicz2011-05-091-0/+2
* | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-231-7/+1
|\ \
| * | grep: use get_pathspec() correctlyJunio C Hamano2011-05-101-7/+1
* | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-061-6/+6
|\ \ \ | |_|/ |/| |
| * | Improve tree_entry_interesting() handling codeNguyễn Thái Ngọc Duy2011-03-251-6/+6
* | | sparse: Fix errors and silence warningsStephen Boyd2011-04-031-3/+3
* | | Merge branch 'jr/grep-en-config'Junio C Hamano2011-04-011-0/+13
|\ \ \
| * | | grep: allow -E and -n to be turned on by default via configurationJoe Ratterman2011-03-301-0/+13
* | | | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-17/+17
|\ \ \ \ | |/ / / |/| | |
| * | | i18n: git-grep "--open-files-in-pager" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
| * | | i18n: git-grep basic messagesÆvar Arnfjörð Bjarmason2011-03-091-16/+16
* | | | Merge branch 'maint'Junio C Hamano2011-03-281-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | grep: Add the option '--line-number'Joe Ratterman2011-03-281-1/+1
* | | | grep: read patterns from stdin with -f -René Scharfe2011-03-191-2/+4
* | | | Merge branch 'maint'Junio C Hamano2011-03-161-2/+1
|\ \ \ \ | |/ / /
| * | | standardize brace placement in struct definitionsJonathan Nieder2011-03-161-2/+1
| |/ /
View Lorry Controller Status