summaryrefslogtreecommitdiff
path: root/builtin/grep.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-19/+27
|\
| * cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
| * sha1-name.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2019-01-141-1/+2
| * grep: use grep_opt->repo instead of explict repo argumentNguyễn Thái Ngọc Duy2019-01-141-17/+24
* | Merge branch 'bc/tree-walk-oid'Junio C Hamano2019-01-291-4/+4
|\ \
| * | tree-walk: store object_id in a separate memberbrian m. carlson2019-01-151-4/+4
| |/
* | Merge branch 'sb/submodule-recursive-fetch-gets-the-tip'Junio C Hamano2019-01-291-7/+10
|\ \
| * | repository: repo_submodule_init to take a submodule structStefan Beller2018-12-051-7/+10
* | | Merge branch 'nd/attr-pathspec-in-tree-walk'Junio C Hamano2019-01-141-1/+2
|\ \ \ | |_|/ |/| |
| * | tree-walk.c: make tree_entry_interesting() take an indexNguyễn Thái Ngọc Duy2018-11-191-1/+2
| |/
* | Merge branch 'jk/loose-object-cache'Junio C Hamano2019-01-041-1/+1
|\ \ | |/ |/|
| * sha1-file: use an object_directory for the main object dirJeff King2018-11-131-1/+1
* | Merge branch 'jk/unused-parameter-fixes'Junio C Hamano2018-11-181-1/+13
|\ \
| * | assert NOARG/NONEG behavior of parse-options callbacksJeff King2018-11-061-1/+13
| |/
* | Merge branch 'nd/pthreads'Junio C Hamano2018-11-181-49/+30
|\ \
| * | grep: clean up num_threads handlingNguyễn Thái Ngọc Duy2018-11-051-31/+27
| * | grep: remove #ifdef NO_PTHREADSNguyễn Thái Ngọc Duy2018-11-051-37/+22
| |/
* | Merge branch 'ao/submodule-wo-gitmodules-checked-out'Junio C Hamano2018-11-131-3/+14
|\ \ | |/ |/|
| * submodule: support reading .gitmodules when it's not in the working treeAntonio Ospite2018-10-311-3/+14
* | Merge branch 'rs/grep-no-recursive'Junio C Hamano2018-10-191-0/+2
|\ \
| * | grep: add -r/--[no-]recursiveRené Scharfe2018-10-031-0/+2
| |/
* | userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
* | grep.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
|/
* 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-151-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-021-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-021-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
|\ \ \ \
View Lorry Controller Status