Merge branch 'nd/checkout-m-doc-update'

author Junio C Hamano <gitster@pobox.com>

Tue, 16 Apr 2019 10:28:10 +0000 (19:28 +0900)

committer Junio C Hamano <gitster@pobox.com>

Tue, 16 Apr 2019 10:28:10 +0000 (19:28 +0900)
author Junio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 10:28:10 +0000 (19:28 +0900)
committer Junio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 10:28:10 +0000 (19:28 +0900)
diff --cc Documentation/git-checkout.txt
Simple merge
diff --cc builtin/checkout.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Tue, 16 Apr 2019 10:28:10 +0000 (19:28 +0900)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 16 Apr 2019 10:28:10 +0000 (19:28 +0900)
		1	2
Documentation/git-checkout.txt	patch \|	diff1 \|	diff2 \|	blob \| history
builtin/checkout.c	patch \|	diff1 \|	diff2 \|	blob \| history