Sync with 2.7.3
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:15:50 +0000 (11:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:15:50 +0000 (11:15 -0800)
1  2 
Documentation/git.txt
Simple merge