Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
* | Merge branch 'jk/config-lockfile-leak-fix' into maint | Junio C Hamano | 2017-10-18 | |
|\ | ||||
| * | config: use a static lock_file struct | Jeff King | 2017-09-06 | |
| * | Merge branch 'jk/parse-config-key-cleanup' into maint | Junio C Hamano | 2017-03-28 | |
| |\ | ||||
| * \ | Merge branch 'jc/config-case-cmdline-take-2' into maint | Junio C Hamano | 2017-03-24 | |
| |\ \ | ||||
* | \ \ | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 | |
|\ \ \ \ | ||||
| * | | | | color: check color.ui in git_default_config() | Jeff King | 2017-07-13 | |
* | | | | | Merge branch 'sb/hashmap-customize-comparison' | Junio C Hamano | 2017-07-13 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | hashmap.h: compare function has access to a data field | Stefan Beller | 2017-06-30 | |
* | | | | | Merge branch 'ab/wildmatch' | Junio C Hamano | 2017-07-10 | |
|\ \ \ \ \ | ||||
| * | | | | | wildmatch: remove unused wildopts parameter | Ævar Arnfjörð Bjarmason | 2017-06-23 | |
* | | | | | | Merge branch 'bw/repo-object' | Junio C Hamano | 2017-07-05 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||
| * | | | | | config: read config from a repository object | 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 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
* | | | | | | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | |
| |/ / / / / / | ||||
* | | | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| * | | | | | | config: don't implicitly use gitdir or commondir | Brandon Williams | 2017-06-15 | |
| * | | | | | | config: respect commondir | Brandon Williams | 2017-06-15 | |
| * | | | | | | setup: teach discover_git_directory to respect the commondir | Brandon Williams | 2017-06-15 | |
| * | | | | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | |
* | | | | | | | Merge branch 'js/alias-early-config' | Junio C Hamano | 2017-06-24 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | ||||
| * | | | | | config: report correct line number upon error | Johannes Schindelin | 2017-06-15 | |
* | | | | | | Merge branch 'nd/fopen-errors' | Junio C Hamano | 2017-06-13 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||
| * | | | | | wrapper.c: add and use fopen_or_warn() | Nguyễn Thái Ngọc Duy | 2017-05-26 | |
| * | | | | | wrapper.c: add and use warn_on_fopen_errors() | Nguyễn Thái Ngọc Duy | 2017-05-26 | |
| |/ / / / | ||||
* | | | | | Merge branch 'ab/conditional-config-with-symlinks' | Junio C Hamano | 2017-05-30 | |
|\ \ \ \ \ | ||||
| * | | | | | config: match both symlink & realpath versions in IncludeIf.gitdir:* | Ævar Arnfjörð Bjarmason | 2017-05-17 | |
| |/ / / / | ||||
* | | | | | Merge branch 'js/plug-leaks' | Junio C Hamano | 2017-05-29 | |
|\ \ \ \ \ | ||||
| * | | | | | git_config_rename_section_in_file(): avoid resource leak | Johannes Schindelin | 2017-05-08 | |
| |/ / / / | ||||
* | | | | | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 | |
* | | | | | Merge branch 'nd/conditional-config-in-early-config' | Junio C Hamano | 2017-04-26 | |
|\ \ \ \ \ | ||||
| * | | | | | config: correct file reading order in read_early_config() | Nguyễn Thái Ngọc Duy | 2017-04-19 | |
| * | | | | | config: handle conditional include when $GIT_DIR is not set up | Nguyễn Thái Ngọc Duy | 2017-04-17 | |
| * | | | | | config: prepare to pass more info in git_config_with_options() | Nguyễn Thái Ngọc Duy | 2017-04-17 | |
| |/ / / / | ||||
* | | | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-04-23 | |
|\ \ \ \ \ | ||||
| * | | | | | config: resolve symlinks in conditional include's patterns | Nguyễn Thái Ngọc Duy | 2017-04-14 | |
| * | | | | | path.c: and an option to call real_path() in expand_user_path() | Nguyễn Thái Ngọc Duy | 2017-04-14 | |
* | | | | | | http.postbuffer: allow full range of ssize_t values | David Turner | 2017-04-13 | |
| |/ / / / |/| | | | | ||||
* | | | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-03-21 | |
|\ \ \ \ \ | |/ / / / | ||||
| * | | | | config: add conditional include | Nguyễn Thái Ngọc Duy | 2017-03-11 | |
| |/ / / | ||||
* | | | | Merge branch 'js/early-config' | Junio C Hamano | 2017-03-17 | |
|\ \ \ \ | ||||
| * | | | | read_early_config(): really discover .git/ | Johannes Schindelin | 2017-03-14 | |
| * | | | | read_early_config(): avoid .git/config hack when unneeded | Johannes Schindelin | 2017-03-14 | |
| * | | | | setup: make read_early_config() reusable | Johannes Schindelin | 2017-03-14 | |
| |/ / / | ||||
* | | | | Merge branch 'cc/split-index-config' | Junio C Hamano | 2017-03-17 | |
|\ \ \ \ | ||||
| * | | | | config: add git_config_get_expiry() from gc.c | Christian Couder | 2017-03-01 | |
| * | | | | config: add git_config_get_max_percent_split_change() | Christian Couder | 2017-03-01 | |
| * | | | | config: add git_config_get_split_index() | Christian Couder | 2017-03-01 | |
| * | | | | config: mark an error message up for translation | Christian Couder | 2017-03-01 |