merge commits:
git rebase -i HEAD~(# the number of merging commits - 1)
revert changes:
git reflog # or git log -g
remove staged folder in cache:
git rm --cached -r [folder name]
merge commits:
git rebase -i HEAD~(# the number of merging commits - 1)
revert changes:
git reflog # or git log -g
remove staged folder in cache:
git rm --cached -r [folder name]