summaryrefslogtreecommitdiffstats
path: root/builtin/grep.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/no-the-index'Junio C Hamano2018-08-201-3/+3
|\
| * grep: use the right index instead of the_indexNguyễn Thái Ngọc Duy2018-08-131-2/+2
| * dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy2018-08-131-3/+3
* | Merge branch 'nd/i18n'Junio C Hamano2018-08-161-6/+6
|\ \ | |/ |/|
| * builtin/grep.c: mark strings for translationNguyễn Thái Ngọc Duy2018-07-231-1/+1
| * Update messages in preparation for i18nNguyễn Thái Ngọc Duy2018-07-231-5/+5
* | Merge branch 'tb/grep-only-matching'Junio C Hamano2018-08-031-0/+6
|\ \
| * | grep.c: teach 'git grep --only-matching'Taylor Blau2018-07-091-0/+6
* | | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-031-1/+2
|\ \ \ | |/ / |/| |
| * | tag: add repository argument to deref_tagStefan Beller2018-06-291-1/+2
| |/
* / builtin/grep.c: add '--column' option to 'git-grep(1)'Taylor Blau2018-06-221-0/+1
|/
* Merge branch 'nd/use-opt-int-set-f'Junio C Hamano2018-06-011-3/+3
|\
| * Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy2018-05-241-3/+3
* | Merge branch 'sb/grep-die-on-unreadable-index'Junio C Hamano2018-05-301-1/+2
|\ \ | |/ |/|
| * grep: handle corrupt index files earlyStefan Beller2018-05-161-1/+2
| * Merge branch 'bw/grep-recurse-submodules' into maintJunio C Hamano2017-11-151-0/+2
| |\
* | \ Merge branch 'sb/submodule-move-nested'Junio C Hamano2018-05-081-8/+6
|\ \ \
| * | | submodule-config: allow submodule_free to handle arbitrary repositoriesStefan Beller2018-03-291-1/+1
| * | | grep: remove "repo" arg from non-supporting funcsJonathan Tan2018-03-291-7/+5
* | | | Merge branch 'sb/object-store'Junio C Hamano2018-04-111-1/+2
|\| | |
| * | | repository: introduce raw object store fieldStefan Beller2018-03-231-1/+2
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-3/+3
|\ \ \ \
| * | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
| * | | | sha1_file: convert read_object_with_reference to object_idbrian m. carlson2018-03-141-2/+2
* | | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-141-5/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | completion: use __gitcomp_builtin in _git_grepNguyễn Thái Ngọc Duy2018-02-091-5/+8
| |/ / /
* | | | Merge branch 'rv/grep-cleanup'Junio C Hamano2018-03-081-13/+20
|\ \ \ \
| * | | | grep: simplify grep_oid and grep_fileRasmus Villemoes2018-02-231-4/+2
| * | | | grep: move grep_source_init outside critical sectionRasmus Villemoes2018-02-231-9/+18
| |/ / /
* / / / object: rename function 'typename' to 'type_name'Brandon Williams2018-02-141-1/+1
|/ / /
* | | Merge branch 'bw/pathspec-match-submodule-boundary'Junio C Hamano2017-12-191-0/+1
|\ \ \
| * | | pathspec: only match across submodule boundaries when requestedBrandon 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 submoduleMartin Å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-271-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-141-2/+0
|\ \ | |/ |/|
| * grep: remove regflags from the public grep_opt APIÆvar Arnfjörð Bjarmason2017-06-301-2/+0