projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9bc454d) | patch
reset: add test cases for "--keep" option
authorChristian Couder <chriscool@tuxfamily.org>
Tue, 19 Jan 2010 04:25:58 +0000 (05:25 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2010 01:46:41 +0000 (17:46 -0800)
commitffbc5dc2d0cbdbd63a4ae04dc2cc1ebf385fcc25
treec73f84fd521a7097a97f3893bbf5c5e89b200691tree | snapshot
parent9bc454df08ca2a27b51ac0ab9ff8f154e51b8698commit | diff
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>
t/t7110-reset-merge.sh diff | blob | blame | history
t/t7111-reset-table.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.