summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-231-0/+4
|\
| * color: check color.ui in git_default_config()Jeff King2017-07-131-0/+4
* | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-131-3/+6
|\ \ | |/ |/|
| * hashmap.h: compare function has access to a data fieldStefan Beller2017-06-301-3/+6
* | Merge branch 'ab/wildmatch'Junio C Hamano2017-07-101-1/+1
|\ \
| * | wildmatch: remove unused wildopts parameterab/wildmatchÆvar Arnfjörð Bjarmason2017-06-231-1/+1
* | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-051-74/+142
|\ \ \ | |_|/ |/| |
| * | config: read config from a repository objectBrandon Williams2017-06-231-74/+142
| | |
| | \
| *-. \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-231-18/+26
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\ \ \ \
| * | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
| |/ / /
* | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-17/+24
|\ \ \ \ | | |_|/ | |/| |
| * | | config: don't implicitly use gitdir or commondirbw/config-hBrandon Williams2017-06-151-10/+11
| * | | config: respect commondirBrandon Williams2017-06-151-4/+7
| * | | setup: teach discover_git_directory to respect the commondirBrandon Williams2017-06-151-4/+6
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | Merge branch 'js/alias-early-config'Junio C Hamano2017-06-241-1/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | config: report correct line number upon errorJohannes Schindelin2017-06-151-1/+2
* | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-1/+4
|\ \ \ | |_|/ |/| |
| * | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-261-1/+1
| * | wrapper.c: add and use warn_on_fopen_errors()Nguyễn Thái Ngọc Duy2017-05-261-0/+3
| |/
* | Merge branch 'ab/conditional-config-with-symlinks'Junio C Hamano2017-05-301-0/+16
|\ \
| * | config: match both symlink & realpath versions in IncludeIf.gitdir:*ab/conditional-config-with-symlinksÆvar Arnfjörð Bjarmason2017-05-171-0/+16
| |/
* | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-291-1/+4
|\ \
| * | git_config_rename_section_in_file(): avoid resource leakJohannes Schindelin2017-05-081-1/+4
| |/
* | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-161-1/+1
|\ \ | |/ |/|
| * timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-271-1/+1
* | Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano2017-04-261-20/+42
|\ \
| * | config: correct file reading order in read_early_config()nd/conditional-config-in-early-configNguyễn Thái Ngọc Duy2017-04-191-14/+12
| * | config: handle conditional include when $GIT_DIR is not set upNguyễn Thái Ngọc Duy2017-04-171-8/+26
| * | config: prepare to pass more info in git_config_with_options()Nguyễn Thái Ngọc Duy2017-04-171-5/+11
| |/
* | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-04-231-6/+6
|\ \
| * | config: resolve symlinks in conditional include's patternsnd/conditional-config-includeNguyễn Thái Ngọc Duy2017-04-141-3/+3
| * | path.c: and an option to call real_path() in expand_user_path()Nguyễn Thái Ngọc Duy2017-04-141-4/+4
* | | http.postbuffer: allow full range of ssize_t valuesdt/http-postbuffer-can-be-largeDavid Turner2017-04-131-0/+17
| |/ |/|
* | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-03-211-0/+92
|\ \ | |/
| * config: add conditional includeNguyễn Thái Ngọc Duy2017-03-111-0/+92
* | Merge branch 'js/early-config'Junio C Hamano2017-03-171-0/+25
|\ \
| * | read_early_config(): really discover .git/Johannes Schindelin2017-03-141-19/+12
| * | read_early_config(): avoid .git/config hack when unneededJohannes Schindelin2017-03-141-2/+3
| * | setup: make read_early_config() reusableJohannes Schindelin2017-03-141-0/+31
| |/
* | Merge branch 'cc/split-index-config'Junio C Hamano2017-03-171-2/+40
|\ \
| * | config: add git_config_get_expiry() from gc.cChristian Couder2017-03-011-0/+13
| * | config: add git_config_get_max_percent_split_change()Christian Couder2017-03-011-0/+15
| * | config: add git_config_get_split_index()Christian Couder2017-03-011-0/+10
| * | config: mark an error message up for translationChristian Couder2017-03-011-2/+2
* | | Merge branch 'jk/parse-config-key-cleanup'Junio C Hamano2017-03-101-6/+9
|\ \ \
| * | | parse_config_key: allow matching single-level configJeff King2017-02-241-2/+6
| * | | parse_config_key: use skip_prefix instead of starts_withJeff King2017-02-241-4/+3
| * | | Merge branch 'nd/config-misc-fixes' into maintJunio C Hamano2017-01-311-5/+15
| |\ \ \
View Lorry Controller Status