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"

diff --cc git-merge.sh
Simple merge

diff --cc git-stash.sh
Simple merge