Merge branch 'jk/command-line-config-empty-string' into maint
commit04cd47f553796263451c946061e175d847f388c3
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:10 +0000 (19 14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:10 +0000 (19 14:05 -0700)
tree24bad2f1f907961c2e2af06f395b8b0fb3258fc7
parent723361a572e8c9fe93f00b17a1f4ed02585923b2
parenta789ca70e7a5b02973b116d21674acd795238f99
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
Documentation/git.txt
config.c
t/t1300-repo-config.sh