Merge branch 'jv/maint-config-set' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 20:03:19 +0000 (12:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 20:03:19 +0000 (12:03 -0800)
* jv/maint-config-set:
  Fix an incorrect reference to --set-all.

1  2 
builtin/config.c

Simple merge