Sync with 2.5.1master
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2015 19:32:45 +0000 (28 12:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2015 19:32:45 +0000 (28 12:32 -0700)
1  2 
Documentation/git.txt

Simple merge