在最初意外删除所有文件的恐慌之后，我使用以下方法来取回我的数据

git reset HEAD@{1}         
git fsck --lost-found      
git show 
git revert <sha that deleted the files>

I saw responses include the command git reset --hard HEAD without any caution. You should be careful with that command because of the option --hard. It resets your index and your remote repo but mostly, it also resets your local repo and all commits that were not pushed to the remote yet will be lost, both from your local repo and index. Never use that flag --hard unless you are sure you also want to reset all your local work from the current commit till the hash you chose. If anyway you did it by mistake, run git reflog to retrieve your ~hash then git reset --hard ~hash to recover your files.

恢复还原程序就可以了

例如,

如果abcdef是你的提交，ghijkl是你还原abcdef时的提交，那么运行:

git revert ghijkl

这将还原还原

或者你可以用git checkout -b <new-branch> and git cherry-pick <commit> the before to the and git rebase to drop revert commit。像以前一样发送拉请求。

我有一个问题，有人做了一个恢复到主到我的分支，但我需要能够合并它，但问题是，恢复包括我所有的提交。 让我们看看这种情况，我们从M1创建了我们的特征分支，我们在M3中合并了我们的特征分支，并在RM3中恢复它

M1 -> M2 -> M3 -> M4- > RM3 -> M5
 \.         /
  F1->F2 -

如何使F2能够合并到M5?

git checkout master
git checkout -b brach-before-revert
git reset --hard M4
git checkout master
git checkout -b new-feature-branch
git reset --hard M1 
git merge --squash brach-before-revert

我是这样做的: 如果分支my_branchname包含在被还原的合并中。我想取消my_branchname:

我首先从my_branchname执行git checkout -b my_new_branchname。 然后我做一个git重置——软$COMMIT_HASH，其中$COMMIT_HASH是my_branchname第一次提交之前的提交哈希(见git日志) 然后我新建一个commit git commit -m "Add back reverted changes" 然后我向上推新的分支git推origin new_branchname 然后我对新分支提出了拉请求。