Merge branch 'hn/refs-trace-backend'

author Junio C Hamano <gitster@pobox.com>

Tue, 22 Sep 2020 19:36:28 +0000 (12:36 -0700)

committer Junio C Hamano <gitster@pobox.com>

Tue, 22 Sep 2020 19:36:28 +0000 (12:36 -0700)
author Junio C Hamano <gitster@pobox.com>
Tue, 22 Sep 2020 19:36:28 +0000 (12:36 -0700)
committer Junio C Hamano <gitster@pobox.com>
Tue, 22 Sep 2020 19:36:28 +0000 (12:36 -0700)
diff --cc Makefile
Simple merge
diff --cc refs.c
Simple merge
diff --cc refs/refs-internal.h
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Tue, 22 Sep 2020 19:36:28 +0000 (12:36 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 22 Sep 2020 19:36:28 +0000 (12:36 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
refs.c	patch \|	diff1 \|	diff2 \|	blob \| history
refs/refs-internal.h	patch \|	diff1 \|	diff2 \|	blob \| history