]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dfe0171 2ba2fe2)
Merge branch 'cb/maint-stash-orphaned-file'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700)
commitb7ef48d5d5f0d5b912a5ca84a7079803387586ae
tree8ad84654ffbdf2071c6a56a08b07c55d0b31eb59tree | snapshot
parentdfe0171c4e78f8c392514a825c363251794fba5dcommit | diff
parent2ba2fe292c13d6442456c1b8a1948bea27992953commit | 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
git-stash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.