Merge branch 'mh/config-flip-xbit-back-after-checking'

author Junio C Hamano <gitster@pobox.com>

Fri, 5 Dec 2014 19:43:10 +0000 (11:43 -0800)

committer Junio C Hamano <gitster@pobox.com>

Fri, 5 Dec 2014 19:43:10 +0000 (11:43 -0800)
author Junio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2014 19:43:10 +0000 (11:43 -0800)
committer Junio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2014 19:43:10 +0000 (11:43 -0800)
diff --cc builtin/init-db.c
Simple merge
diff --cc t/t0001-init.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Fri, 5 Dec 2014 19:43:10 +0000 (11:43 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 5 Dec 2014 19:43:10 +0000 (11:43 -0800)
		1	2
builtin/init-db.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t0001-init.sh	patch \|	diff1 \|	diff2 \|	blob \| history