一:确定需要还原到哪个commit
通过git log命令找到commit id
wester@wester-PC:/wester/$ git log
commit e38f86ff10e0f32d420ffd3646243cda97c78367
Author: wester <c11099019>
Date: Fri Jun 5 15:34:18 2020 +0800
其中:commit后面跟的就是commit id
二:执行回滚命令
git reset e38f86ff10e0f32d420ffd3646243cda97c78367
三:添加并提交到暂存区
git commit -am "reset to e38f86ff10e0f32d420ffd3646243cda97c78367"
四:强推送到远程仓库
git push -f origin master
注意这一步可能会报异常
推送报错(pre-receive hook declined):
remote: GitLab: You are not allowed to force push code to a protected branch on this project.
! [remote rejected] master -> master (pre-receive hook declined)
解决:
这是因为git默认情况maset是受保护分支不允许强推送,需要取消保护
1:打开设置 - 仓库找到 Protected Branches
2:点击 Unprotect 按钮删除保护
3:继续强推git push -f origin master
4:完成推送后添加master保护