Sync with 2.2.2
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 22:08:42 +0000 (14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 22:08:42 +0000 (14:08 -0800)
1  2 
Documentation/git.txt
Simple merge