Merge tag 'v2.8.6' into maint-2.9

author Junio C Hamano <gitster@pobox.com>

Sun, 30 Jul 2017 21:52:14 +0000 (14:52 -0700)

committer Junio C Hamano <gitster@pobox.com>

Sun, 30 Jul 2017 21:52:14 +0000 (14:52 -0700)
author Junio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 21:52:14 +0000 (14:52 -0700)
committer Junio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 21:52:14 +0000 (14:52 -0700)
diff --cc cache.h
Simple merge
diff --cc path.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Sun, 30 Jul 2017 21:52:14 +0000 (14:52 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sun, 30 Jul 2017 21:52:14 +0000 (14:52 -0700)
		1	2
cache.h	patch \|	diff1 \|	diff2 \|	blob \| history
path.c	patch \|	diff1 \|	diff2 \|	blob \| history