Merge branch 'jk/maint-config-param'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:45:21 +0000 (09:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:45:21 +0000 (09:45 -0700)
* jk/maint-config-param:
config: use strbuf_split_str instead of a temporary strbuf
strbuf: allow strbuf_split to work on non-strbufs
config: avoid segfault when parsing command-line config
config: die on error in command-line config
fix "git -c" parsing of values with equals signs
strbuf_split: add a max parameter

1  2 
config.c
strbuf.c
strbuf.h
diff --cc config.c
Simple merge
diff --cc strbuf.c
Simple merge
diff --cc strbuf.h
Simple merge