Merge branch 'jc/stash-create'
commit5e389c430d232e8b1a16e7357596328985111eab
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Nov 2007 22:05:47 +0000 (14 14:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Nov 2007 22:05:47 +0000 (14 14:05 -0800)
treecec4f0c0e6281c537798c61be9127d0ee0ac9175
parent55571f7861b81b033b378f3abe145ecbdbc1fdb6
parenta9ee9bf9f9840498f2369ebafe6c220deb4327fd
Merge branch 'jc/stash-create'

* jc/stash-create:
  git-stash: Fix listing stashes
  git-merge: no reason to use cpio anymore
  Revert "rebase: allow starting from a dirty tree."
  rebase: allow starting from a dirty tree.
  stash: implement "stash create"
git-merge.sh
git-stash.sh