Merge branch 'jk/refs-double-abort'

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index f179b43732aa2a7e211a95889847294890c90d38..877e5f503a66145912886c14917f0e68512e6284 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -242,6 +242,8 @@ should result in deletion of the path).
 +
 When checking out paths from the index, this option lets you recreate
 the conflicted merge in the specified paths.
++
+When switching branches with `--merge`, staged changes may be lost.
 
 --conflict=<style>::
        The same as --merge option above, but changes the way the