Merge branch 'jk/command-line-config-empty-string' into maint

* jk/command-line-config-empty-string:
config: teach "git -c" to recognize an empty string

Conflicts:
config.c

diff --cc Documentation/git.txt
Simple merge

diff --cc config.c
index 058505cb8d8d8bb531527b620125b0204732458a,5390a63acb372eaa18ba4e83022789155fcc1c1f..6cbf701a8f3e8837dac9c308cc19a1483114879d
--- 1/config.c
--- 2/config.c
+++ b/config.c
@@@ -173,8 -183,8 +181,8 @@@ int git_config_parse_parameter(const ch
                strbuf_list_free(pair);
                return error("bogus config parameter: %s", text);
        }
 -      lowercase(pair[0]->buf);
 +      strbuf_tolower(pair[0]);
-       if (fn(pair[0]->buf, pair[1] ? pair[1]->buf : NULL, data) < 0) {
+       if (fn(pair[0]->buf, value, data) < 0) {
                strbuf_list_free(pair);
                return -1;
        }

diff --cc t/t1300-repo-config.sh
Simple merge