![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Sep 2007 07:42:01 +0000 (00:42 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Sep 2007 07:42:01 +0000 (00:42 -0700) | ||
| commit | 9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e | |
| tree | d49794a304c2b949d9a49e56b7e5028cce44e406 | tree | snapshot |
| parent | 148c63006a8e4985a9eee0863073588d8ac18a8a | commit | diff |
| parent | 58f6fb53dd1104559f6f5507562a975c0ff079af | commit | diff |
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".
* 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".
| Makefile | diff1 | | diff2 | | blob | history |
| builtin-add.c | diff1 | | diff2 | | blob | history |
| builtin-apply.c | diff1 | | diff2 | | blob | history |