![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700) | ||
| commit | b7ef48d5d5f0d5b912a5ca84a7079803387586ae | |
| tree | 8ad84654ffbdf2071c6a56a08b07c55d0b31eb59 | tree | snapshot |
| parent | dfe0171c4e78f8c392514a825c363251794fba5d | commit | diff |
| parent | 2ba2fe292c13d6442456c1b8a1948bea27992953 | commit | diff |
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
* 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
| git-stash.sh | diff1 | | diff2 | | blob | history |