Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-08-22 | 1 | -310/+86 | |
|\ | ||||||
| * | grep: recurse in-process using 'struct repository' | Brandon Williams | 2017-08-02 | 1 | -310/+86 | |
* | | Merge branch 'jk/ref-filter-colors' | Junio C Hamano | 2017-08-11 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | color: check color.ui in git_default_config() | Jeff King | 2017-07-13 | 1 | -1/+1 | |
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-08-11 | 1 | -4/+4 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | sha1_name: convert GET_SHA1* flags to GET_OID* | brian m. carlson | 2017-07-17 | 1 | -1/+1 | |
| * | | sha1_name: convert get_sha1* to get_oid* | brian m. carlson | 2017-07-17 | 1 | -2/+2 | |
| * | | submodule: convert submodule config lookup to use object_id | brian m. carlson | 2017-07-17 | 1 | -2/+2 | |
| |/ | ||||||
* | | Merge branch 'ab/grep-lose-opt-regflags' | Junio C Hamano | 2017-07-13 | 1 | -2/+0 | |
|\ \ | |/ |/| | ||||||
| * | grep: remove regflags from the public grep_opt API | Ævar Arnfjörð Bjarmason | 2017-06-30 | 1 | -2/+0 | |
* | | Merge branch 'rs/use-div-round-up' | Junio C Hamano | 2017-07-12 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | use DIV_ROUND_UPrs/use-div-round-up | René Scharfe | 2017-07-10 | 1 | -1/+1 | |
* | | | Merge branch 'bw/repo-object' | Junio C Hamano | 2017-07-05 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | submodule: convert is_submodule_initialized to work on a repository | Brandon Williams | 2017-06-23 | 1 | -1/+2 | |
| | | | | ||||||
| | \ \ | ||||||
| *-. \ \ | Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob... | Junio C Hamano | 2017-06-23 | 1 | -0/+1 | |
| |\ \ \ \ | ||||||
* | | | | | | Spelling fixesvs/typofixes | Ville Skyttä | 2017-06-27 | 1 | -1/+1 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 | |
* | | | | Merge branch 'bw/object-id' | Junio C Hamano | 2017-06-19 | 1 | -11/+11 | |
|\ \ \ \ | ||||||
| * | | | | grep: convert to struct object_id | Brandon Williams | 2017-06-02 | 1 | -11/+11 | |
* | | | | | Merge branch 'ab/pcre-v2' | Junio C Hamano | 2017-06-19 | 1 | -3/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | grep: skip pthreads overhead when using one thread | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -0/+2 | |
| * | | | | | grep: don't redundantly compile throwaway patterns under threading | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -3/+11 | |
* | | | | | | Merge branch 'sb/submodule-blanket-recursive' | Junio C Hamano | 2017-06-13 | 1 | -0/+3 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | builtin/grep.c: respect 'submodule.recurse' option | Stefan Beller | 2017-06-01 | 1 | -0/+3 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'ab/grep-preparatory-cleanup' | Junio C Hamano | 2017-06-02 | 1 | -4/+19 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | grep: assert that threading is enabled when calling grep_{lock,unlock}ab/grep-preparatory-cleanup | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -4/+4 | |
| * | | | | grep: given --threads with NO_PTHREADS=YesPlease, warn | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -0/+13 | |
| * | | | | grep: catch a missing enum in switch statement | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -0/+2 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'jk/diff-blob' | Junio C Hamano | 2017-06-02 | 1 | -1/+3 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||||
| * | | get_sha1_with_context: dynamically allocate oc->path | Jeff King | 2017-05-24 | 1 | -1/+3 | |
| |/ | ||||||
* | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-05-29 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | object: convert parse_object* to take struct object_id | brian m. carlson | 2017-05-08 | 1 | -1/+1 | |
| |/ | ||||||
* | | dir: convert fill_directory to take an indexbw/dir-c-stops-relying-on-the-index | Brandon Williams | 2017-05-06 | 1 | -1/+1 | |
|/ | ||||||
* | Merge branch 'ab/grep-plug-pathspec-leak' | Junio C Hamano | 2017-04-19 | 1 | -0/+1 | |
|\ | ||||||
| * | grep: plug a trivial memory leakab/grep-plug-pathspec-leak | Ævar Arnfjörð Bjarmason | 2017-04-16 | 1 | -0/+1 | |
* | | Merge branch 'bw/recurse-submodules-relative-fix' | Junio C Hamano | 2017-03-30 | 1 | -16/+25 | |
|\ \ | ||||||
| * | | grep: fix bug when recursing with relative pathspec | Brandon Williams | 2017-03-17 | 1 | -15/+24 | |
| * | | grep: fix help text typo | Brandon Williams | 2017-03-17 | 1 | -1/+1 | |
* | | | Merge branch 'sb/checkout-recurse-submodules' | Junio C Hamano | 2017-03-28 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | make is_submodule_populated gently | Stefan Beller | 2017-03-15 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-03-28 | 1 | -12/+9 | |
|\ \ \ | ||||||
| * | | | grep: fix builds with with no thread support | Brandon Williams | 2017-03-18 | 1 | -12/+9 | |
| |/ / | ||||||
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-03-17 | 1 | -12/+12 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | builtin/grep: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -12/+12 | |
| |/ | ||||||
* | | grep: treat revs the same for --untracked as for --no-indexjk/grep-no-index-fix | Jeff King | 2017-02-14 | 1 | -5/+5 | |
* | | grep: do not diagnose misspelt revs with --no-index | Jeff King | 2017-02-14 | 1 | -1/+1 | |
* | | grep: avoid resolving revision names in --no-index case | Jeff King | 2017-02-14 | 1 | -0/+6 | |
* | | grep: fix "--" rev/pathspec disambiguation | Jeff King | 2017-02-14 | 1 | -5/+24 | |
* | | grep: re-order rev-parsing loop | Jeff King | 2017-02-14 | 1 | -9/+11 |