From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2007 07:42:01 +0000 (-0700)
Subject: Merge branch 'cr/reset'
X-Git-Tag: v1.5.4-rc0~434
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e;p=git.git

Merge branch 'cr/reset'

* cr/reset:
  Simplify cache API
  An additional test for "git-reset -- path"
  Make "git reset" a builtin.
  Move make_cache_entry() from merge-recursive.c into read-cache.c
  Add tests for documented features of "git reset".
---

9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e