From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jun 2010 23:23:48 +0000 (-0700)
Subject: Merge branch 'cb/maint-stash-orphaned-file' into maint
X-Git-Tag: v1.7.2-rc0~7^2~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=91788cf26e86c5bfb54431e7af34783d4c71dda0;p=git.git

Merge branch 'cb/maint-stash-orphaned-file' into maint

* cb/maint-stash-orphaned-file:
  stash tests: stash can lose data in a file removed from the index
  stash: Don't overwrite files that have gone from the index
---

91788cf26e86c5bfb54431e7af34783d4c71dda0