diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:53:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:53:13 -0700 |
| commit | eff7c32cfd12867000d6449d335fad0e7c9751f1 (patch) | |
| tree | 392708c905f6d77ea5052dee5f1b76e7fe7f0a31 /xdiff/xdiffi.h | |
| parent | Merge branch 'jn/doc-dashdash' into maint (diff) | |
| parent | config: use strbuf_split_str instead of a temporary strbuf (diff) | |
| download | tgif-eff7c32cfd12867000d6449d335fad0e7c9751f1.tar.xz | |
Merge branch 'jk/maint-config-param' into maint
* 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
Diffstat (limited to 'xdiff/xdiffi.h')
0 files changed, 0 insertions, 0 deletions