From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Apr 2011 18:36:42 +0000 (-0700)
Subject: Merge branch 'dm/stash-k-i-p'
X-Git-Tag: v1.7.6-rc0~146
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65bc83d704b82b613f1f61b4ad97412376ab4a69;p=git.git

Merge branch 'dm/stash-k-i-p'

* dm/stash-k-i-p:
  stash: ensure --no-keep-index and --patch can be used in any order
  stash: add two more tests for --no-keep-index
---

65bc83d704b82b613f1f61b4ad97412376ab4a69