summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-181-4/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-171-4/+0
* | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-031-23/+91
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-181-20/+82
| * | | config: create a function to format section headersSahil Dua2017-06-181-2/+11
* | | | Merge branch 'rj/no-sign-compare'Junio C Hamano2017-09-291-1/+1
|\ \ \ \
| * | | | ALLOC_GROW: avoid -Wsign-compare warningsrj/no-sign-compareRamsay Jones2017-09-221-1/+1
| | |/ / | |/| |
* | | | Merge branch 'jk/fallthrough'Junio C Hamano2017-09-281-0/+1
|\ \ \ \
| * | | | consistently use "fallthrough" comments in switchesjk/fallthroughJeff King2017-09-221-0/+1
* | | | | Merge branch 'jk/write-in-full-fix'Junio C Hamano2017-09-251-19/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | config: flip return value of store_write_*()Jeff King2017-09-141-13/+15
| * | | | avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-141-2/+2
| * | | | config: avoid "write_in_full(fd, buf, len) < len" patternJeff King2017-09-141-4/+2
| |/ / /
| * | | Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-231-0/+4
| |\ \ \
* | \ \ \ Merge branch 'ma/remove-config-maybe-bool'Junio C Hamano2017-09-191-5/+0
|\ \ \ \ \
| * | | | | config: remove git_config_maybe_boolma/remove-config-maybe-boolMartin Ågren2017-09-071-5/+0
* | | | | | stop leaking lock structs in some simple casesjk/incore-lockfile-removalJeff King2017-09-061-17/+7
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-261-0/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-configJunio C Hamano2017-08-221-0/+22
| |/ / /
* | | | Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-221-5/+10
|\ \ \ \
| * | | | treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-071-1/+1
| * | | | config: make git_{config,parse}_maybe_bool equivalentMartin Ågren2017-08-071-5/+5
| * | | | config: introduce git_parse_maybe_bool_textMartin Ågren2017-08-071-3/+8
* | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-221-0/+17
|\ \ \ \ \
| * | | | | config: add config_from_gitmodulesBrandon Williams2017-08-021-0/+17
| | |/ / / | |/| | |
* | | | | Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-111-4/+6
|\ \ \ \ \
| * | | | | config.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-4/+6
* | | | | | Merge branch 'jk/ref-filter-colors'Junio C Hamano2017-08-111-0/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | color: check color.ui in git_default_config()Jeff King2017-07-131-0/+4
* | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-08-111-6/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-171-6/+6
| |/ / / /
* | | | | 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
| |/ / / /