From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 May 2011 21:57:49 +0000 (-0700)
Subject: Merge branch 'dm/stash-k-i-p' into maint
X-Git-Tag: v1.7.5.1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e9f1878da7be816042c915cdf0542f9325c36209;p=git.git

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

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

e9f1878da7be816042c915cdf0542f9325c36209