| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/ref-filter-colors-fix' | Junio C Hamano | 2017-10-18 | 1 | -4/+0 |
|\ |
|
| * | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 1 | -4/+0 |
* | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-10-03 | 1 | -23/+91 |
|\ \ |
|
| * | | branch: add a --copy (-c) option to go with --move (-m) | Sahil Dua | 2017-06-18 | 1 | -20/+82 |
| * | | config: create a function to format section headers | Sahil Dua | 2017-06-18 | 1 | -2/+11 |
* | | | Merge branch 'rj/no-sign-compare' | Junio C Hamano | 2017-09-29 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | ALLOC_GROW: avoid -Wsign-compare warningsrj/no-sign-compare | Ramsay Jones | 2017-09-22 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge branch 'jk/fallthrough' | Junio C Hamano | 2017-09-28 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | consistently use "fallthrough" comments in switchesjk/fallthrough | Jeff King | 2017-09-22 | 1 | -0/+1 |
* | | | | Merge branch 'jk/write-in-full-fix' | Junio C Hamano | 2017-09-25 | 1 | -19/+19 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | config: flip return value of store_write_*() | Jeff King | 2017-09-14 | 1 | -13/+15 |
| * | | | avoid "write_in_full(fd, buf, len) != len" pattern | Jeff King | 2017-09-14 | 1 | -2/+2 |
| * | | | config: avoid "write_in_full(fd, buf, len) < len" pattern | Jeff King | 2017-09-14 | 1 | -4/+2 |
| |/ / |
|
| * | | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 | 1 | -0/+4 |
| |\ \ |
|
* | \ \ | Merge branch 'ma/remove-config-maybe-bool' | Junio C Hamano | 2017-09-19 | 1 | -5/+0 |
|\ \ \ \ |
|
| * | | | | config: remove git_config_maybe_boolma/remove-config-maybe-bool | Martin Ågren | 2017-09-07 | 1 | -5/+0 |
* | | | | | stop leaking lock structs in some simple casesjk/incore-lockfile-removal | Jeff King | 2017-09-06 | 1 | -17/+7 |
* | | | | | Merge branch 'jc/cutoff-config' | Junio C Hamano | 2017-08-26 | 1 | -0/+22 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-config | Junio C Hamano | 2017-08-22 | 1 | -0/+22 |
| |/ / / |
|
* | | | | Merge branch 'ma/parse-maybe-bool' | Junio C Hamano | 2017-08-22 | 1 | -5/+10 |
|\ \ \ \ |
|
| * | | | | treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool | Martin Ågren | 2017-08-07 | 1 | -1/+1 |
| * | | | | config: make git_{config,parse}_maybe_bool equivalent | Martin Ågren | 2017-08-07 | 1 | -5/+5 |
| * | | | | config: introduce git_parse_maybe_bool_text | Martin Ågren | 2017-08-07 | 1 | -3/+8 |
* | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-08-22 | 1 | -0/+17 |
|\ \ \ \ \ |
|
| * | | | | | config: add config_from_gitmodules | Brandon Williams | 2017-08-02 | 1 | -0/+17 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'sb/hashmap-cleanup' | Junio C Hamano | 2017-08-11 | 1 | -4/+6 |
|\ \ \ \ \ |
|
| * | | | | | config.c: drop hashmap_cmp_fn cast | Stefan Beller | 2017-07-05 | 1 | -4/+6 |
* | | | | | | Merge branch 'jk/ref-filter-colors' | Junio C Hamano | 2017-08-11 | 1 | -0/+4 |
|\ \ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| * | | | | | color: check color.ui in git_default_config() | Jeff King | 2017-07-13 | 1 | -0/+4 |
* | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-08-11 | 1 | -6/+6 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | submodule: convert submodule config lookup to use object_id | brian m. carlson | 2017-07-17 | 1 | -6/+6 |
| |/ / / / |
|
* | | | | | Merge branch 'sb/hashmap-customize-comparison' | Junio C Hamano | 2017-07-13 | 1 | -3/+6 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | hashmap.h: compare function has access to a data field | Stefan Beller | 2017-06-30 | 1 | -3/+6 |
* | | | | Merge branch 'ab/wildmatch' | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | wildmatch: remove unused wildopts parameterab/wildmatch | Ævar Arnfjörð Bjarmason | 2017-06-23 | 1 | -1/+1 |
* | | | | | Merge branch 'bw/repo-object' | Junio C Hamano | 2017-07-05 | 1 | -74/+142 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | config: read config from a repository object | Brandon Williams | 2017-06-23 | 1 | -74/+142 |
| | | | | | |
| | \ \ \ | |
| *-. \ \ \ | Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob... | Junio C Hamano | 2017-06-23 | 1 | -18/+26 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | | /
| | | |_|/
| | |/| | |
|
* | | | | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -2/+1 |
|\ \ \ \ \ |
|
| * | | | | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -2/+1 |
| |/ / / / |
|
* | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -17/+24 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | config: don't implicitly use gitdir or commondirbw/config-h | Brandon Williams | 2017-06-15 | 1 | -10/+11 |
| * | | | | config: respect commondir | Brandon Williams | 2017-06-15 | 1 | -4/+7 |
| * | | | | setup: teach discover_git_directory to respect the commondir | Brandon Williams | 2017-06-15 | 1 | -4/+6 |
| * | | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
* | | | | | Merge branch 'js/alias-early-config' | Junio C Hamano | 2017-06-24 | 1 | -1/+2 |
|\ \ \ \ \
| |/ / / /
| | / / /
| |/ / /
|/| | | |
|
| * | | | config: report correct line number upon error | Johannes Schindelin | 2017-06-15 | 1 | -1/+2 |
* | | | | Merge branch 'nd/fopen-errors' | Junio C Hamano | 2017-06-13 | 1 | -1/+4 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | wrapper.c: add and use fopen_or_warn() | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -1/+1 |
| * | | | wrapper.c: add and use warn_on_fopen_errors() | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -0/+3 |
| |/ / |
|