Sync with 2.12.2
authorJunio C Hamano <redacted>
Fri, 24 Mar 2017 20:31:01 +0000 (13:31 -0700)
committerJunio C Hamano <redacted>
Fri, 24 Mar 2017 20:31:01 +0000 (13:31 -0700)
1  2 
.mailmap
Documentation/git.txt

diff --cc .mailmap
Simple merge
Simple merge
git clone https://git.99rst.org/PROJECT