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