Merge branch 'as/config-doc-markup-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2015 19:29:01 +0000 (12:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2015 19:29:01 +0000 (12:29 -0700)
* as/config-doc-markup-fix:
Documentation/config: fix formatting for branch.*.rebase and pull.rebase

1  2 
Documentation/config.txt
Simple merge