Do commit/stash/reset rather than stash --keep-index
fixes #221