| commit | 38488ba85a6c4115d18a185bb7795fb6f11cdf16 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:19 +0000 (4 17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:19 +0000 (4 17:50 -0700) | ||
| tree | 5102fabd8f53adc8484d528435a4d8c5ec0e8ab7 | treesnapshot (tar.gz zip) |
| parent | 59881b88aa34d5a92aa89f885f975be4e7102e1b | commitdiff |
| parent | 2ba2fe292c13d6442456c1b8a1948bea27992953 | commitdiff |
Merge branch 'cb/maint-stash-orphaned-file' into next
* 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 | blobhistory |