Merge branch 'master' into next
commita6e4e595bdba4c3e6d55c1b487b71ec8157db6de
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 01:35:28 +0000 (22 17:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 01:35:28 +0000 (22 17:35 -0800)
tree02d3634b97b20405c7eacdf1f491be0dffc37a3b
parent6f4acd852f04b96f16b86624efec1c38cf7ce222
parent046613c5465e4fc0611f93a5ef31d3815fb50c22
Merge branch 'master' into next

* master:
  update-index --refresh --porcelain: add missing const
  checkout: add missing const to describe_detached_head
builtin/checkout.c
cache.h
read-cache.c