From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2019 10:28:10 +0000 (+0900)
Subject: Merge branch 'nd/checkout-m-doc-update'
X-Git-Tag: v2.22.0-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3feaacbaa15f6437a1767935a5ff04fdef0e86e3

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

Doc about the above.

* nd/checkout-m-doc-update:
checkout.txt: note about losing staged changes with --merge
---

3feaacbaa15f6437a1767935a5ff04fdef0e86e3