aboutsummaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAge
* Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-22
|\
| * treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-07
| * config: make git_{config,parse}_maybe_bool equivalentMartin Ågren2017-08-07
| * config: introduce git_parse_maybe_bool_textMartin Ågren2017-08-07
* | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-22
|\ \
| * | config: add config_from_gitmodulesBrandon Williams2017-08-02
* | | Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-11
|\ \ \
| * | | config.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
* | | | Merge branch 'jk/ref-filter-colors'Junio C Hamano2017-08-11
|\ \ \ \
| * | | | color: check color.ui in git_default_config()Jeff King2017-07-13
* | | | | Merge branch 'bc/object-id'Junio C Hamano2017-08-11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-17
| |/ / /
* | | | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-13
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-30
* | | Merge branch 'ab/wildmatch'Junio C Hamano2017-07-10
|\ \ \
| * | | wildmatch: remove unused wildopts parameterÆvar Arnfjörð Bjarmason2017-06-23
* | | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-05
|\ \ \ \ | |_|/ / |/| | |
| * | | config: read config from a repository objectBrandon Williams2017-06-23
| | | |
| | \ \
| *-. \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-23
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-24
|\ \ \ \ \
| * | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-16
| |/ / / /
* | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | config: don't implicitly use gitdir or commondirBrandon Williams2017-06-15
| * | | | config: respect commondirBrandon Williams2017-06-15
| * | | | setup: teach discover_git_directory to respect the commondirBrandon Williams2017-06-15
| * | | | config: don't include config.h by defaultBrandon Williams2017-06-15
* | | | | Merge branch 'js/alias-early-config'Junio C Hamano2017-06-24
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | config: report correct line number upon errorJohannes Schindelin2017-06-15
* | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-13
|\ \ \ \ | |_|/ / |/| | |
| * | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-26
| * | | wrapper.c: add and use warn_on_fopen_errors()Nguyễn Thái Ngọc Duy2017-05-26
| |/ /
* | | Merge branch 'ab/conditional-config-with-symlinks'Junio C Hamano2017-05-30
|\ \ \
| * | | config: match both symlink & realpath versions in IncludeIf.gitdir:*Ævar Arnfjörð Bjarmason2017-05-17
| |/ /
* | | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-29
|\ \ \
| * | | git_config_rename_section_in_file(): avoid resource leakJohannes Schindelin2017-05-08
| |/ /
* | | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-16
|\ \ \ | |/ / |/| |
| * | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-27
* | | Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano2017-04-26
|\ \ \
| * | | config: correct file reading order in read_early_config()Nguyễn Thái Ngọc Duy2017-04-19
| * | | config: handle conditional include when $GIT_DIR is not set upNguyễn Thái Ngọc Duy2017-04-17
| * | | config: prepare to pass more info in git_config_with_options()Nguyễn Thái Ngọc Duy2017-04-17
| |/ /
* | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-04-23
|\ \ \
| * | | config: resolve symlinks in conditional include's patternsNguyễn Thái Ngọc Duy2017-04-14
| * | | path.c: and an option to call real_path() in expand_user_path()Nguyễn Thái Ngọc Duy2017-04-14
* | | | http.postbuffer: allow full range of ssize_t valuesDavid Turner2017-04-13
| |/ / |/| |
* | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-03-21
|\ \ \ | |/ /
| * | config: add conditional includeNguyễn Thái Ngọc Duy2017-03-11
| |/
* | Merge branch 'js/early-config'Junio C Hamano2017-03-17
|\ \
| * | read_early_config(): really discover .git/Johannes Schindelin2017-03-14
| * | read_early_config(): avoid .git/config hack when unneededJohannes Schindelin2017-03-14