![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jan 2010 19:58:56 +0000 (11:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jan 2010 19:58:56 +0000 (11:58 -0800) | ||
| commit | dc96c5ee703fb7265619b1ecb2b5f2c5ab3ef40d | |
| tree | 2d81a990aa60381e5ab751e1c88a7e7e6e2142ae | tree | snapshot |
| parent | 73d66323ac78c750ba42fef23b1cb8fd2110e023 | commit | diff |
| parent | d7eed8cbef2d15e87e9002f5e3ce08830b40b292 | commit | diff |
Merge branch 'cc/reset-more'
* cc/reset-more:
t7111: check that reset options work as described in the tables
Documentation: reset: add some missing tables
Fix bit assignment for CE_CONFLICTED
"reset --merge": fix unmerged case
reset: use "unpack_trees()" directly instead of "git read-tree"
reset: add a few tests for "git reset --merge"
Documentation: reset: add some tables to describe the different options
reset: improve mixed reset error message when in a bare repo
* cc/reset-more:
t7111: check that reset options work as described in the tables
Documentation: reset: add some missing tables
Fix bit assignment for CE_CONFLICTED
"reset --merge": fix unmerged case
reset: use "unpack_trees()" directly instead of "git read-tree"
reset: add a few tests for "git reset --merge"
Documentation: reset: add some tables to describe the different options
reset: improve mixed reset error message when in a bare repo
| Documentation/git-reset.txt | diff1 | | diff2 | | blob | history |
| builtin-reset.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| read-cache.c | diff1 | | diff2 | | blob | history |
| unpack-trees.c | diff1 | | diff2 | | blob | history |