Code

Merge branch 'cb/maint-stash-orphaned-file' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jun 2010 23:23:48 +0000 (16:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jun 2010 23:23:48 +0000 (16:23 -0700)
commit91788cf26e86c5bfb54431e7af34783d4c71dda0
tree47c288c47c5b5d72a06ad42e774503a73493d639
parent2b7d947b8f57f377b24bc2e802d0af67ff911d6f
parent2ba2fe292c13d6442456c1b8a1948bea27992953
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