From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Mar 2010 18:29:35 +0000 (-0700)
Subject: Merge branch 'cc/reset-keep'
X-Git-Tag: v1.7.1-rc0~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49559cad6cab8af548321249d320d9bb372d1859;p=thirdparty%2Fgit.git

Merge branch 'cc/reset-keep'

* 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"
---

49559cad6cab8af548321249d320d9bb372d1859