diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-13 22:58:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-13 22:58:56 +0300 |
| commit | dc96c5ee703fb7265619b1ecb2b5f2c5ab3ef40d (patch) | |
| tree | 2d81a990aa60381e5ab751e1c88a7e7e6e2142ae /tree.c | |
| parent | 73d66323ac78c750ba42fef23b1cb8fd2110e023 (diff) | |
| parent | d7eed8cbef2d15e87e9002f5e3ce08830b40b292 (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
Diffstat (limited to 'tree.c')
0 files changed, 0 insertions, 0 deletions