Sync with v2.9.1
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:46:39 +0000 (10:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:46:39 +0000 (10:46 -0700)
* maint:
Git 2.9.1

1  2 
Documentation/git.txt
Simple merge