Sync with 2.12.2

author Junio C Hamano <gitster@pobox.com>

Fri, 24 Mar 2017 20:31:01 +0000 (13:31 -0700)

committer Junio C Hamano <gitster@pobox.com>

Fri, 24 Mar 2017 20:31:01 +0000 (13:31 -0700)
author Junio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:31:01 +0000 (13:31 -0700)
committer Junio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:31:01 +0000 (13:31 -0700)
diff --cc .mailmap
Simple merge
diff --cc Documentation/git.txt
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Fri, 24 Mar 2017 20:31:01 +0000 (13:31 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 24 Mar 2017 20:31:01 +0000 (13:31 -0700)
		1	2
.mailmap	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history