git 解决ahead behind分叉以及删除远端commit

最新推荐文章于 2025-06-27 09:08:09 发布

seamanj

最新推荐文章于 2025-06-27 09:08:09 发布

阅读量5.8k

点赞数 1

CC 4.0 BY-SA版权

分类专栏： GITHUB

本文链接：https://blog.youkuaiyun.com/seamanj/article/details/78917914

GITHUB 专栏收录该内容

19 篇文章

订阅专栏

本文介绍了如何使用Git进行一些高级操作，例如撤销提交、还原工作目录的状态以及如何处理分支之间的ahead/behind问题。还提供了如何删除本地和远程提交的具体步骤。

解决ahead / behind

先reset到ahead,然后退回到分叉，再checkout 远端的behind

如果要删除本地的commit，先到本地的最前端，然后再用下面的命令

If you want to fix up your latest commit, you can undo the commit, and
unstage the files in it, by doing:

git reset HEAD~1 This will return your repository to its state before
the git add commands that staged the files. Your changes will be in
your working directory. HEAD~1 refers to the commit below the current
tip of the branch.

If you want to uncommit N commits, but keep the code changes in your
working directory:

git reset HEAD~N If you want to get rid of your latest commit, and do
not want to keep the code changes, you can do a “hard” reset.

git reset –hard HEAD~1 Likewise, if you want to discard the last N
commits, and do not want to keep the code changes:

git reset –hard HEAD~N

2.删除远端commit

先退回到正确的local commit然后
git push –force