Merge branch 'js/stash'
authorJunio C Hamano <gitster@pobox.com>
Sat, 7 Jul 2007 20:38:06 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Jul 2007 20:38:06 +0000 (13:38 -0700)
* js/stash:
  Teach git-stash to "apply --index"

1  2 
git-stash.sh

diff --cc git-stash.sh
Simple merge