Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | 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 | |
| |/ / | ||||||
* | | | Merge branch 'ab/conditional-config-with-symlinks' | Junio C Hamano | 2017-05-30 | 1 | -0/+16 | |
|\ \ \ | ||||||
| * | | | config: match both symlink & realpath versions in IncludeIf.gitdir:*ab/conditional-config-with-symlinks | Ævar Arnfjörð Bjarmason | 2017-05-17 | 1 | -0/+16 | |
| |/ / | ||||||
* | | | Merge branch 'js/plug-leaks' | Junio C Hamano | 2017-05-29 | 1 | -1/+4 | |
|\ \ \ | ||||||
| * | | | git_config_rename_section_in_file(): avoid resource leak | Johannes Schindelin | 2017-05-08 | 1 | -1/+4 | |
| |/ / | ||||||
* | | | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 | 1 | -1/+1 | |
* | | | Merge branch 'nd/conditional-config-in-early-config' | Junio C Hamano | 2017-04-26 | 1 | -20/+42 | |
|\ \ \ | ||||||
| * | | | config: correct file reading order in read_early_config()nd/conditional-config-in-early-config | Nguyễn Thái Ngọc Duy | 2017-04-19 | 1 | -14/+12 | |
| * | | | config: handle conditional include when $GIT_DIR is not set up | Nguyễn Thái Ngọc Duy | 2017-04-17 | 1 | -8/+26 | |
| * | | | config: prepare to pass more info in git_config_with_options() | Nguyễn Thái Ngọc Duy | 2017-04-17 | 1 | -5/+11 | |
| |/ / | ||||||
* | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-04-23 | 1 | -6/+6 | |
|\ \ \ | ||||||
| * | | | config: resolve symlinks in conditional include's patternsnd/conditional-config-include | Nguyễn Thái Ngọc Duy | 2017-04-14 | 1 | -3/+3 | |
| * | | | path.c: and an option to call real_path() in expand_user_path() | Nguyễn Thái Ngọc Duy | 2017-04-14 | 1 | -4/+4 | |
* | | | | http.postbuffer: allow full range of ssize_t valuesdt/http-postbuffer-can-be-large | David Turner | 2017-04-13 | 1 | -0/+17 | |
| |/ / |/| | | ||||||
* | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-03-21 | 1 | -0/+92 | |
|\ \ \ | |/ / | ||||||
| * | | config: add conditional include | Nguyễn Thái Ngọc Duy | 2017-03-11 | 1 | -0/+92 | |
| |/ | ||||||
* | | Merge branch 'js/early-config' | Junio C Hamano | 2017-03-17 | 1 | -0/+25 | |
|\ \ |