Sync with 2.3.7
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Apr 2015 19:26:21 +0000 (12:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Apr 2015 19:26:21 +0000 (12:26 -0700)
1  2 
Documentation/git.txt
Simple merge