Merge branch 'nm/pull-submodule-recurse-config' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Sep 2017 08:40:38 +0000 (17:40 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Sep 2017 08:40:38 +0000 (17:40 +0900)
"git -c submodule.recurse=yes pull" did not work as if the
"--recurse-submodules" option was given from the command line.
This has been corrected.

* nm/pull-submodule-recurse-config:
pull: honor submodule.recurse config option
pull: fix cli and config option parsing order

Trivial merge