Sync with 2.4.2
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:50:39 +0000 (13:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:50:51 +0000 (13:50 -0700)
1  2 
Documentation/git.txt
Simple merge