Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
* | Merge branch 'bw/pathspec-match-submodule-boundary' | Junio C Hamano | 2017-12-19 | |
|\ | ||||
| * | pathspec: only match across submodule boundaries when requested | Brandon Williams | 2017-12-05 | |
* | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-11-06 | |
|\ \ | |/ | ||||
| * | grep: take the read-lock when adding a submodule | Martin Ågren | 2017-11-02 | |
* | | Merge branch 'jk/ref-filter-colors-fix' | Junio C Hamano | 2017-10-18 | |
|\ \ | ||||
| * | | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | |
| * | | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 | |
| |\ \ | ||||
* | \ \ | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-08-26 | |
|\ \ \ \ | ||||
| * | | | | submodule: remove gitmodules_config | Brandon Williams | 2017-08-03 | |
| * | | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanup | Junio C Hamano | 2017-08-02 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | ||||
* | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-08-22 | |
|\ \ \ \ \ | |/ / / / | ||||
| * | | | | grep: recurse in-process using 'struct repository' | Brandon Williams | 2017-08-02 | |
| | |/ / | |/| | | ||||
* | | | | Merge branch 'jk/ref-filter-colors' | Junio C Hamano | 2017-08-11 | |
|\ \ \ \ | | |_|/ | |/| | | ||||
| * | | | color: check color.ui in git_default_config() | Jeff King | 2017-07-13 | |
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-08-11 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||
| * | | sha1_name: convert GET_SHA1* flags to GET_OID* | brian m. carlson | 2017-07-17 | |
| * | | sha1_name: convert get_sha1* to get_oid* | brian m. carlson | 2017-07-17 | |
| * | | submodule: convert submodule config lookup to use object_id | brian m. carlson | 2017-07-17 | |
| |/ | ||||
* | | Merge branch 'ab/grep-lose-opt-regflags' | Junio C Hamano | 2017-07-13 | |
|\ \ | |/ |/| | ||||
| * | grep: remove regflags from the public grep_opt API | Ævar Arnfjörð Bjarmason | 2017-06-30 | |
* | | Merge branch 'rs/use-div-round-up' | Junio C Hamano | 2017-07-12 | |
|\ \ | ||||
| * | | use DIV_ROUND_UP | René Scharfe | 2017-07-10 | |
* | | | Merge branch 'bw/repo-object' | Junio C Hamano | 2017-07-05 | |
|\ \ \ | ||||
| * | | | submodule: convert is_submodule_initialized to work on a repository | Brandon Williams | 2017-06-23 | |
| | | | | ||||
| | \ \ | ||||
| *-. \ \ | Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob... | Junio C Hamano | 2017-06-23 | |
| |\ \ \ \ | ||||
* | | | | | | Spelling fixes | Ville Skyttä | 2017-06-27 | |
| |_|_|_|/ |/| | | | | ||||
* | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | ||||
| * | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | |
* | | | | Merge branch 'bw/object-id' | Junio C Hamano | 2017-06-19 | |
|\ \ \ \ | ||||
| * | | | | grep: convert to struct object_id | Brandon Williams | 2017-06-02 | |
* | | | | | Merge branch 'ab/pcre-v2' | Junio C Hamano | 2017-06-19 | |
|\ \ \ \ \ | ||||
| * | | | | | grep: skip pthreads overhead when using one thread | Ævar Arnfjörð Bjarmason | 2017-05-26 | |
| * | | | | | grep: don't redundantly compile throwaway patterns under threading | Ævar Arnfjörð Bjarmason | 2017-05-26 | |
* | | | | | | Merge branch 'sb/submodule-blanket-recursive' | Junio C Hamano | 2017-06-13 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||
| * | | | | | builtin/grep.c: respect 'submodule.recurse' option | Stefan Beller | 2017-06-01 | |
| |/ / / / | ||||
* | | | | | Merge branch 'ab/grep-preparatory-cleanup' | Junio C Hamano | 2017-06-02 | |
|\ \ \ \ \ | |/ / / / | ||||
| * | | | | grep: assert that threading is enabled when calling grep_{lock,unlock} | Ævar Arnfjörð Bjarmason | 2017-05-26 | |
| * | | | | grep: given --threads with NO_PTHREADS=YesPlease, warn | Ævar Arnfjörð Bjarmason | 2017-05-26 | |
| * | | | | grep: catch a missing enum in switch statement | Ævar Arnfjörð Bjarmason | 2017-05-26 | |
| | |/ / | |/| | | ||||
* | | | | Merge branch 'jk/diff-blob' | Junio C Hamano | 2017-06-02 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||
| * | | get_sha1_with_context: dynamically allocate oc->path | Jeff King | 2017-05-24 | |
| |/ | ||||
* | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-05-29 | |
|\ \ | ||||
| * | | object: convert parse_object* to take struct object_id | brian m. carlson | 2017-05-08 | |
| |/ | ||||
* | | dir: convert fill_directory to take an index | Brandon Williams | 2017-05-06 | |
|/ | ||||
* | Merge branch 'ab/grep-plug-pathspec-leak' | Junio C Hamano | 2017-04-19 | |
|\ | ||||
| * | grep: plug a trivial memory leak | Ævar Arnfjörð Bjarmason | 2017-04-16 | |
* | | Merge branch 'bw/recurse-submodules-relative-fix' | Junio C Hamano | 2017-03-30 | |
|\ \ | ||||
| * | | grep: fix bug when recursing with relative pathspec | Brandon Williams | 2017-03-17 | |
| * | | grep: fix help text typo | Brandon Williams | 2017-03-17 | |
* | | | Merge branch 'sb/checkout-recurse-submodules' | Junio C Hamano | 2017-03-28 | |
|\ \ \ |