summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* config: move config_from_gitmodules to submodule-config.cAntonio Ospite2018-06-261-17/+0
* Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-251-0/+13
|\
| * Add and use generic name->id mapping code for color slot parsingNguyễn Thái Ngọc Duy2018-05-291-0/+13
* | Merge branch 'ma/config-store-data-clear'Junio C Hamano2018-05-301-18/+18
|\ \
| * | config: let `config_store_data_clear()` handle `key`Martin Ågren2018-05-211-7/+3
| * | config: let `config_store_data_clear()` handle `value_regex`Martin Ågren2018-05-211-11/+6
| * | config: free resources of `struct config_store_data`Martin Ågren2018-05-211-0/+9
| |/
* | Merge branch 'js/empty-config-section-fix'Junio C Hamano2018-05-301-1/+1
|\ \
| * | config: a user-provided invalid section is not a BUGJohannes Schindelin2018-05-181-1/+1
* | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-6/+6
|\ \ \ | |_|/ |/| |
| * | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-6/+6
* | | Merge branch 'js/colored-push-errors'Junio C Hamano2018-05-081-1/+1
|\ \ \
| * | | push: colorize errorsRyan Dammrose2018-04-241-1/+1
* | | | Merge branch 'tb/config-default'Junio C Hamano2018-05-081-0/+10
|\ \ \ \
| * | | | config.c: introduce 'git_config_color' to parse ANSI colorsTaylor Blau2018-04-231-0/+10
* | | | | Merge branch 'ls/checkout-encoding'Junio C Hamano2018-05-081-0/+5
|\ \ \ \ \
| * | | | | convert: add round trip check based on 'core.checkRoundtripEncoding'Lars Schneider2018-04-161-0/+5
* | | | | | Merge branch 'ds/commit-graph'Junio C Hamano2018-05-081-0/+5
|\ \ \ \ \ \
| * | | | | | commit-graph: add core.commitGraph settingDerrick Stolee2018-04-111-0/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/empty-config-section-fix'Junio C Hamano2018-05-081-133/+315
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | git_config_set: reuse empty sectionsJohannes Schindelin2018-04-091-1/+13
| * | | | git config --unset: remove empty sections (in the common case)Johannes Schindelin2018-04-091-2/+91
| * | | | git_config_set: make use of the config parser's event streamJohannes Schindelin2018-04-091-89/+81
| * | | | git_config_set: do not use a state machineJohannes Schindelin2018-04-091-30/+29
| * | | | config_set_store: rename some fields for consistencyJohannes Schindelin2018-04-091-32/+31
| * | | | config: avoid using the global variable `store`Johannes Schindelin2018-04-091-53/+66
| * | | | config: introduce an optional event stream while parsingJohannes Schindelin2018-04-091-12/+89
| * | | | config --replace-all: avoid extra line breaksJohannes Schindelin2018-04-061-0/+1
| * | | | git_config_set: fix off-by-twoJohannes Schindelin2018-04-061-1/+1
* | | | | Merge branch 'sb/filenames-with-dashes'Junio C Hamano2018-04-251-1/+1
|\ \ \ \ \
| * | | | | exec_cmd: rename to use dash in file nameStefan Beller2018-04-111-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/flockfile-stdio'Junio C Hamano2018-04-251-3/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | config: move flockfile() closer to unlocked functionsjk/flockfile-stdioJeff King2018-03-301-3/+5
| * | | | Merge branch 'sd/branch-copy' into maintJunio C Hamano2017-12-061-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/config-write-section-fix' into maintJunio C Hamano2017-11-281-1/+1
| |\ \ \ \ \
* | | | | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'tb/crlf-conv-flags'Junio C Hamano2018-02-131-2/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flagsTorsten Bögershausen2018-01-161-2/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jh/partial-clone'Junio C Hamano2018-02-131-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | partial-clone: define partial clone settings in configJeff Hostetler2017-12-081-0/+5
| |/ / /
* | | | Merge branch 'hm/config-parse-expiry-date'Junio C Hamano2017-12-061-0/+10
|\ \ \ \
| * | | | config: add --expiry-datehm/config-parse-expiry-dateHaaris Mehmood2017-11-181-0/+10
* | | | | Merge branch 'rs/config-write-section-fix'Junio C Hamano2017-11-271-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | config: flip return value of write_section()rs/config-write-section-fixRené Scharfe2017-11-181-1/+1
* | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-11-271-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | config: avoid "write_in_full(fd, buf, len) != len" patternsd/branch-copyPhillip Wood2017-11-161-2/+2
* | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-211-0/+14
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-0/+14
* | | | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-11/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-9/+8