From: Junio C Hamano <redacted>
Date: Tue, 16 Apr 2019 10:28:10 +0000 (+0900)
Subject: Merge branch 'nd/checkout-m-doc-update'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=3feaacbaa15f6437a1767935a5ff04fdef0e86e3;p=git.git

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