# remove files from commit
git reset --soft HEAD^

# revert all changes
git status | while IFS=: read -A line; do echo $line[2]; git reset HEAD $line[2]; done

# discard changes
git status | while IFS=: read -A line; do echo $line[2]; git checkout -- $line[2]; done