diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:25 -0700 |
| commit | 7f346e9d73e75871d525664f36b7a5166b4feaf3 (patch) | |
| tree | 23ed0c98c3e379888f2d16e8d8dfd31468637ec0 /git-merge-resolve.sh | |
| parent | Update draft release notes to 2.2 (diff) | |
| parent | add tests for `git_config_get_string_const()` (diff) | |
| download | tgif-7f346e9d73e75871d525664f36b7a5166b4feaf3.tar.xz | |
Merge branch 'ta/config-set-1'
Use the new caching config-set API in git_config() calls.
* ta/config-set-1:
add tests for `git_config_get_string_const()`
add a test for semantic errors in config files
rewrite git_config() to use the config-set API
config: add `git_die_config()` to the config-set API
change `git_config()` return value to void
add line number and file name info to `config_set`
config.c: fix accuracy of line number in errors
config.c: mark error and warnings strings for translation
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions