summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/remote-rename-update-config'Junio C Hamano2020-02-251-0/+8
|\
| * config: provide access to the current line numberBert Wesarg2020-02-101-0/+8
* | Merge branch 'mr/show-config-scope'Junio C Hamano2020-02-171-7/+28
|\ \ | |/
| * submodule-config: add subomdule config scopeMatthew Rogers2020-02-101-0/+2
| * config: teach git_config_source to remember its scopeMatthew Rogers2020-02-101-0/+3
| * config: preserve scope in do_git_config_sequenceMatthew Rogers2020-02-101-1/+2
| * config: clarify meaning of command line scopingMatthew Rogers2020-02-101-3/+3
| * config: split repo scope to local and worktreeMatthew Rogers2020-02-101-7/+6
| * config: make scope_name non-static and rename itMatthew Rogers2020-02-101-0/+16
* | strbuf: add and use strbuf_insertstr()René Scharfe2020-02-101-1/+1
|/
* sparse-checkout: add 'cone' modeDerrick Stolee2019-11-221-0/+5
* Merge branch 'ew/hashmap'Junio C Hamano2019-10-151-11/+13
|\
| * hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong2019-10-071-2/+1
| * OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong2019-10-071-1/+0
| * hashmap: introduce hashmap_free_entriesEric Wong2019-10-071-1/+1
| * hashmap: use *_entry APIs for iterationEric Wong2019-10-071-2/+3
| * hashmap_cmp_fn takes hashmap_entry paramsEric Wong2019-10-071-4/+6
| * hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong2019-10-071-1/+2
| * hashmap_get takes "const struct hashmap_entry *"Eric Wong2019-10-071-1/+1
| * hashmap_add takes "struct hashmap_entry *"Eric Wong2019-10-071-1/+1
| * hashmap_entry_init takes "struct hashmap_entry *"Eric Wong2019-10-071-2/+2
* | Merge branch 'bc/object-id-part17'Junio C Hamano2019-10-111-1/+1
|\ \
| * | config: use the_hash_algo in abbrev comparisonbrian m. carlson2019-08-191-1/+1
| |/
* | Merge branch 'cc/multi-promisor'Junio C Hamano2019-09-181-5/+0
|\ \
| * | Move core_partial_clone_filter_default to promisor-remote.cChristian Couder2019-06-251-5/+0
* | | Merge branch 'ds/feature-macros'Junio C Hamano2019-09-091-24/+0
|\ \ \
| * | | repo-settings: parse core.untrackedCacheDerrick Stolee2019-08-131-24/+0
* | | | config: stop checking whether the_repository is NULLJeff King2019-08-061-1/+1
| |_|/ |/| |
* | | config: work around bug with includeif:onbranch and early configJohannes Schindelin2019-07-311-1/+2
* | | Merge branch 'ab/test-env'Junio C Hamano2019-07-251-9/+19
|\ \ \ | |/ / |/| |
| * | tests: make GIT_TEST_GETTEXT_POISON a booleanÆvar Arnfjörð Bjarmason2019-06-211-0/+9
| * | config.c: refactor die_bad_number() to not call gettext() earlyÆvar Arnfjörð Bjarmason2019-06-211-9/+10
| |/
* | Merge branch 'rs/config-unit-parsing'Junio C Hamano2019-07-091-21/+18
|\ \
| * | config: simplify parsing of unit factorsRené Scharfe2019-06-241-18/+12
| * | config: don't multiply in parse_unit_factor()René Scharfe2019-06-241-7/+9
| * | config: use unsigned_mult_overflows to check for overflowsRené Scharfe2019-06-241-6/+7
* | | Merge branch 'js/gcc-8-and-9'Junio C Hamano2019-07-091-2/+2
|\ \ \ | |/ /
| * | config: avoid calling `labs()` on too-large data typeJohannes Schindelin2019-06-131-2/+2
| |/
* | config: learn the "onbranch:" includeIf conditionDenton Liu2019-06-051-2/+29
|/
* Merge branch 'jh/trace2-sid-fix'Junio C Hamano2019-05-131-5/+25
|\
| * trace2: fixup access problem on /etc/gitconfig in read_very_early_configJeff Hostetler2019-05-071-1/+4
| * config: add read_very_early_config()Jeff Hostetler2019-04-161-3/+20
| * config: initialize opts structure in repo_read_config()Jeff Hostetler2019-04-161-1/+1
* | Merge branch 'nd/include-if-wildmatch'Junio C Hamano2019-04-221-1/+1
|\ \ | |/ |/|
| * config: correct '**' matching in includeIf patternsNguyễn Thái Ngọc Duy2019-04-011-1/+1
* | Merge branch 'jh/trace2'Junio C Hamano2019-03-071-0/+2
|\ \
| * | trace2: create new combined trace facilityJeff Hostetler2019-02-221-0/+2
| |/
* | Merge branch 'wh/author-committer-ident-config'Junio C Hamano2019-03-071-1/+3
|\ \ | |/ |/|
| * config: allow giving separate author and committer identsWilliam Hubbs2019-02-041-1/+3
* | config: drop unused parameter from maybe_remove_section()Jeff King2019-01-241-2/+1
|/