Andrew's git / gitweb.git / diff
?
Merge branch 'mm/maint-config-explicit-bool-display' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)
* mm/maint-config-explicit-bool-display:
config: display key_delim for config --bool --get-regexp

1  2 
builtin/config.c patch | diff1 | diff2 | blob | history
t/t1300-repo-config.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/config.c
Simple merge
diff --cc t/t1300-repo-config.sh
Simple merge