| commit | ffbc5dc2d0cbdbd63a4ae04dc2cc1ebf385fcc25 | |
| author | Christian Couder <chriscool@tuxfamily.org> | |
| Tue, 19 Jan 2010 04:25:58 +0000 (19 05:25 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jan 2010 01:46:41 +0000 (24 17:46 -0800) | ||
| tree | c73f84fd521a7097a97f3893bbf5c5e89b200691 | treesnapshot (tar.gz zip) |
| parent | 9bc454df08ca2a27b51ac0ab9ff8f154e51b8698 | commitdiff |
reset: add test cases for "--keep" option
This shows that with the "--keep" option, changes that are both in
the work tree and the index are kept in the work tree after the
reset (but discarded in the index).
In the case of unmerged entries, we can see that "git reset --keep"
works only when the target state is the same as HEAD. And then the
work tree is not reset.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This shows that with the "--keep" option, changes that are both in
the work tree and the index are kept in the work tree after the
reset (but discarded in the index).
In the case of unmerged entries, we can see that "git reset --keep"
works only when the target state is the same as HEAD. And then the
work tree is not reset.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7110-reset-merge.sh | diffblobblamehistory | |
| t/t7111-reset-table.sh | diffblobblamehistory |