Merge branch 'mc/push-recurse-submodules-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Dec 2015 18:59:05 +0000 (10:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Dec 2015 18:59:05 +0000 (10:59 -0800)
Add new config to avoid typing "--recurse-submodules" on each push.

* mc/push-recurse-submodules-config:
push: follow the "last one wins" convention for --recurse-submodules
push: test that --recurse-submodules on command line overrides config
push: add recurseSubmodules config option

1  2 
Documentation/config.txt
Simple merge