summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-21 13:16:44 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-21 13:16:44 -0800
commit2739889c98e8d1c1a40263f7f7c0866879c31edf (patch)
treeb350efc0f2cb28c89c5dc6972c9dddea9ad25ae0 /resolve-undo.c
parentfda800f0b1f2ddd2bd8e1e8bfc2dfed6119fa602 (diff)
parent5ba1a8a735c721cc66cc030866163f6fdb7f5ecb (diff)
downloadgit-2739889c98e8d1c1a40263f7f7c0866879c31edf.tar.gz
Merge branch 'jk/config-ignore-duplicates'
Drop duplicate detection from "git-config --get"; this lets it better match the internal config callbacks, which clears up some corner cases with includes. * jk/config-ignore-duplicates: builtin/config.c: Fix a sparse warning git-config: use git_config_with_options git-config: do not complain about duplicate entries git-config: collect values instead of immediately printing git-config: fix regexp memory leaks on error conditions git-config: remove memory leak of key regexp t1300: test "git config --get-all" more thoroughly t1300: remove redundant test t1300: style updates
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions