summaryrefslogtreecommitdiff
path: root/builtin/grep.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/pathspec-match-submodule-boundary'Junio C Hamano2017-12-191-0/+1
|\
| * pathspec: only match across submodule boundaries when requestedbw/pathspec-match-submodule-boundaryBrandon Williams2017-12-051-0/+1
* | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-11-061-0/+2
|\ \ | |/
| * grep: take the read-lock when adding a submodulebw/grep-recurse-submodulesMartin Ågren2017-11-021-0/+2
* | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-181-1/+1
|\ \
| * | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-171-1/+1
| * | Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-231-1/+1
| |\ \
* | \ \ Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-4/+0
|\ \ \ \
| * | | | submodule: remove gitmodules_configBrandon Williams2017-08-031-4/+0
| * | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-021-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-221-310/+86
|\ \ \ \ \ | |/ / / /
| * | | | grep: recurse in-process using 'struct repository'Brandon Williams2017-08-021-310/+86
| | |/ / | |/| |
* | | | Merge branch 'jk/ref-filter-colors'Junio C Hamano2017-08-111-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | color: check color.ui in git_default_config()Jeff King2017-07-131-1/+1
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-08-111-4/+4
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | sha1_name: convert GET_SHA1* flags to GET_OID*brian m. carlson2017-07-171-1/+1
| * | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-2/+2
| * | submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-171-2/+2
| |/
* | Merge branch 'ab/grep-lose-opt-regflags'Junio C Hamano2017-07-131-2/+0
|\ \ | |/ |/|
| * grep: remove regflags from the public grep_opt APIÆvar Arnfjörð Bjarmason2017-06-301-2/+0
* | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-121-1/+1
|\ \
| * | use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-101-1/+1
* | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-051-1/+2
|\ \ \
| * | | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-231-1/+2
| | | |
| | \ \
| *-. \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-231-0/+1
| |\ \ \ \
* | | | | | Spelling fixesvs/typofixesVille Skyttä2017-06-271-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-11/+11
|\ \ \ \
| * | | | grep: convert to struct object_idBrandon Williams2017-06-021-11/+11
* | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-191-3/+13
|\ \ \ \ \
| * | | | | grep: skip pthreads overhead when using one threadÆvar Arnfjörð Bjarmason2017-05-261-0/+2
| * | | | | grep: don't redundantly compile throwaway patterns under threadingÆvar Arnfjörð Bjarmason2017-05-261-3/+11
* | | | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-131-0/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | builtin/grep.c: respect 'submodule.recurse' optionStefan Beller2017-06-011-0/+3
| |/ / / /
* | | | | Merge branch 'ab/grep-preparatory-cleanup'Junio C Hamano2017-06-021-4/+19
|\ \ \ \ \ | |/ / / /
| * | | | grep: assert that threading is enabled when calling grep_{lock,unlock}ab/grep-preparatory-cleanupÆvar Arnfjörð Bjarmason2017-05-261-4/+4
| * | | | grep: given --threads with NO_PTHREADS=YesPlease, warnÆvar Arnfjörð Bjarmason2017-05-261-0/+13
| * | | | grep: catch a missing enum in switch statementÆvar Arnfjörð Bjarmason2017-05-261-0/+2
| | |/ / | |/| |
* | | | Merge branch 'jk/diff-blob'Junio C Hamano2017-06-021-1/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | get_sha1_with_context: dynamically allocate oc->pathJeff King2017-05-241-1/+3
| |/
* | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-1/+1
|\ \
| * | object: convert parse_object* to take struct object_idbrian m. carlson2017-05-081-1/+1
| |/
* | dir: convert fill_directory to take an indexbw/dir-c-stops-relying-on-the-indexBrandon Williams2017-05-061-1/+1
|/
* Merge branch 'ab/grep-plug-pathspec-leak'Junio C Hamano2017-04-191-0/+1
|\
| * grep: plug a trivial memory leakab/grep-plug-pathspec-leakÆvar Arnfjörð Bjarmason2017-04-161-0/+1
* | Merge branch 'bw/recurse-submodules-relative-fix'Junio C Hamano2017-03-301-16/+25
|\ \
| * | grep: fix bug when recursing with relative pathspecBrandon Williams2017-03-171-15/+24
| * | grep: fix help text typoBrandon Williams2017-03-171-1/+1
* | | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-281-1/+1
|\ \ \