Merge branch 'sb/misc-cleanups'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)
* sb/misc-cleanups:
  submodule-config: don't shadow `cache`
  config.c: drop local variable

1  2 
config.c
submodule-config.c

diff --cc config.c
Simple merge
Simple merge