Merge branch 'cc/reset-keep'
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:35 +0000 (11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:35 +0000 (11:29 -0700)
* cc/reset-keep:
Documentation: improve description of "git reset --keep"
reset: disallow using --keep when there are unmerged entries
reset: disallow "reset --keep" outside a work tree
Documentation: reset: describe new "--keep" option
reset: add test cases for "--keep" option
reset: add option "--keep" to "git reset"

No differences found