撤消所有本地提交但尚未推送的git文件

Question

For test purpose, I have created two files respectively, "admin/1.txt" and "user/2.txt", my command flow is as below:

git add admin/* git commit -m "first commit" git add user/* git commit -m "second commit"

This local commit process could happen multiple times. But after that, I need to rollback all these local-committed-yet-not-pushed files back to there start state (untracked or modified), how could I do that in one line of command? I've tried git reset HEAD~1 , but it only rollback 1 step, not all local commitments. Any ideas? Thanks.

Answer 1

使用git checkout -b new_branch将您未提交的更改保存在新分支中，然后返回到以前的分支，然后使用git reset --hard origin/master