projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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

1  2 
git-stash.sh patch | diff1 | diff2 | blob | history

diff --cc git-stash.sh
Simple merge
Git—the stupid content tracker