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


Trivial merge
Git—the stupid content tracker