Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:20:01 +0000 (15:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:20:16 +0000 (15:20 -0800)
1  2 
Documentation/git.txt
Simple merge