From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 May 2010 11:02:23 +0000 (-0700)
Subject: Merge branch 'cb/maint-stash-orphaned-file'
X-Git-Tag: v1.7.2-rc0~105
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7ef48d5d5f0d5b912a5ca84a7079803387586ae;p=git.git

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

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

b7ef48d5d5f0d5b912a5ca84a7079803387586ae