Merge branch 'jc/advice-about-to-lose-commit'

* jc/advice-about-to-lose-commit: checkout: make advice when reattaching the HEAD less loud Conflicts: builtin/checkout.c

Junio C Hamano committed Jun 29, 2011 at 17:03 UTC 0faf247485c2dc92fd8b492a5c4b49237e0338ee

No changes.