Merge branch 'js/commit-slab-decl-fix'
commit7a3ea666331cd6cf8d9a7a15aafc33459b8c571c
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:20 +0000 (10 12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:20 +0000 (10 12:33 -0700)
treebdd9065ea6c5010d136e3ca59bf59c1ea68adb24
parent483ca933f8fee1e9264aeef71f48f086e7cc70db
parentaf920e369778a4cc42519ef523131d29451bf79b
Merge branch 'js/commit-slab-decl-fix'

* js/commit-slab-decl-fix:
  commit-slab.h: avoid duplicated global static variables
  config.c: avoid duplicated global static variables
builtin/config.c
commit-slab.h