Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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:* | Æ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() | Nguyễn Thái Ngọc Duy | 2017-04-20 | 1 | -14/+12 |
| * | | config: handle conditional include when $GIT_DIR is not set up | Nguyễn Thái Ngọc Duy | 2017-04-18 | 1 | -8/+26 |
| * | | config: prepare to pass more info in git_config_with_options() | Nguyễn Thái Ngọc Duy | 2017-04-18 | 1 | -5/+11 |
| |/ | |||||
* | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-04-24 | 1 | -6/+6 |
|\ \ | |||||
| * | | config: resolve symlinks in conditional include's patterns | Nguyễn Thái Ngọc Duy | 2017-04-15 | 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-15 | 1 | -4/+4 |
* | | | http.postbuffer: allow full range of ssize_t values | David Turner | 2017-04-14 | 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-12 | 1 | -0/+92 |
* | | Merge branch 'js/early-config' | Junio C Hamano | 2017-03-17 | 1 | -0/+25 |
|\ \ | |||||
| * | | read_early_config(): really discover .git/ | Johannes Schindelin | 2017-03-14 | 1 | -19/+12 |
| * | | read_early_config(): avoid .git/config hack when unneeded | Johannes Schindelin | 2017-03-14 | 1 | -2/+3 |
| * | | setup: make read_early_config() reusable | Johannes Schindelin | 2017-03-14 | 1 | -0/+31 |
| |/ | |||||
* | | Merge branch 'cc/split-index-config' | Junio C Hamano | 2017-03-17 | 1 | -2/+40 |
|\ \ | |||||
| * | | config: add git_config_get_expiry() from gc.c | Christian Couder | 2017-03-01 | 1 | -0/+13 |
| * | | config: add git_config_get_max_percent_split_change() | Christian Couder | 2017-03-01 | 1 | -0/+15 |
| * | | config: add git_config_get_split_index() | Christian Couder | 2017-03-01 | 1 | -0/+10 |
| * | | config: mark an error message up for translation | Christian Couder | 2017-03-01 | 1 | -2/+2 |
* | | | Merge branch 'jk/parse-config-key-cleanup' | Junio C Hamano | 2017-03-10 | 1 | -6/+9 |
|\ \ \ | |||||
| * | | | parse_config_key: allow matching single-level config | Jeff King | 2017-02-24 | 1 | -2/+6 |
| * | | | parse_config_key: use skip_prefix instead of starts_with | Jeff King | 2017-02-24 | 1 | -4/+3 |
| * | | | Merge branch 'nd/config-misc-fixes' into maint | Junio C Hamano | 2017-01-31 | 1 | -5/+15 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/abbrev-autoscale-config' into maint | Junio C Hamano | 2017-01-31 | 1 | -4/+10 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jc/config-case-cmdline-take-2' | Junio C Hamano | 2017-03-10 | 1 | -97/+101 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | config: use git_config_parse_key() in git_config_parse_parameter() | Junio C Hamano | 2017-02-24 | 1 | -5/+9 |
| * | | | | | config: move a few helper functions up | Junio C Hamano | 2017-02-23 | 1 | -92/+92 |
* | | | | | | refs: add option core.logAllRefUpdates = always | Cornelius Weig | 2017-01-31 | 1 | -1/+6 |
* | | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-01-19 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodules: load gitmodules file from commit sha1 | Brandon Williams | 2016-12-22 | 1 | -4/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'nd/config-misc-fixes' | Junio C Hamano | 2017-01-11 | 1 | -5/+15 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | config.c: handle lock file in error case in git_config_rename_... | Nguyễn Thái Ngọc Duy | 2016-12-22 | 1 | -1/+3 |
| * | | | | | config.c: rename label unlock_and_out | Nguyễn Thái Ngọc Duy | 2016-12-20 | 1 | -2/+2 |
| * | | | | | config.c: handle error case for fstat() calls | Nguyễn Thái Ngọc Duy | 2016-12-20 | 1 | -2/+10 |
| * | | | | | Merge branch 'pc/occurred' into maint | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'jc/abbrev-autoscale-config' | Junio C Hamano | 2017-01-11 | 1 | -4/+10 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | config.abbrev: document the new default that auto-scales | Junio C Hamano | 2016-12-22 | 1 | -4/+10 |
| | |_|/ / | |/| | | | |||||
* / | | | | compression: unify pack.compression configuration parsing | Junio C Hamano | 2016-11-16 | 1 | -0/+16 |
|/ / / / | |||||
* | | | | get_short_sha1: make default disambiguation configurable | Jeff King | 2016-09-27 | 1 | -0/+3 |
* | | | | Merge branch 'jk/setup-sequence-update' | Junio C Hamano | 2016-09-22 | 1 | -4/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | config: only read .git/config from configured repos | Jeff King | 2016-09-14 | 1 | -1/+1 |
| * | | | pager: stop loading git_default_config() | Jeff King | 2016-09-14 | 1 | -3/+0 |
* | | | | i18n: simplify numeric error reporting | Jean-Noel Avila | 2016-08-24 | 1 | -28/+16 |
* | | | | i18n: config: unfold error messages marked for translation | Vasco Almeida | 2016-07-28 | 1 | -19/+98 |