summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-11 10:33:26 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-11 10:33:26 -0700
commit554913daf43f744f7d6bd8bd2cd008d96d19cbd9 (patch)
treee83dcd2916bf78c7433392afa81461fd4b0fef53 /combine-diff.c
parent7f346e9d73e75871d525664f36b7a5166b4feaf3 (diff)
parentb35b10d463fbc274a2edd006f6f5ab46e66a4722 (diff)
downloadgit-554913daf43f744f7d6bd8bd2cd008d96d19cbd9.tar.gz
Merge branch 'ta/config-set-2'
Update git_config() users with callback functions for a very narrow scope with calls to config-set API that lets us query a single variable. * ta/config-set-2: builtin/apply.c: replace `git_config()` with `git_config_get_string_const()` merge-recursive.c: replace `git_config()` with `git_config_get_int()` ll-merge.c: refactor `read_merge_config()` to use `git_config_string()` fast-import.c: replace `git_config()` with `git_config_get_*()` family branch.c: replace `git_config()` with `git_config_get_string() alias.c: replace `git_config()` with `git_config_get_string()` imap-send.c: replace `git_config()` with `git_config_get_*()` family pager.c: replace `git_config()` with `git_config_get_value()` builtin/gc.c: replace `git_config()` with `git_config_get_*()` family rerere.c: replace `git_config()` with `git_config_get_*()` family fetchpack.c: replace `git_config()` with `git_config_get_*()` family archive.c: replace `git_config()` with `git_config_get_bool()` family read-cache.c: replace `git_config()` with `git_config_get_*()` family http-backend.c: replace `git_config()` with `git_config_get_bool()` family daemon.c: replace `git_config()` with `git_config_get_bool()` family
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions