Merge branch 'jc/advice-about-to-lose-commit'
commit0faf247485c2dc92fd8b492a5c4b49237e0338ee
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (29 17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (29 17:03 -0700)
tree11dd5084b96ee09a38257693a6a29cbb6b3ab081
parentdbae1a13363c45d3f77061f61ca73a0c3ed045cf
parentf807b3dcab9cafd76936d24936b8353f99b2ae6d
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
builtin/checkout.c