事件背景:已经提交了一个新增的文件,但是执行 git rebase (复位基底),导致本地代码丢失,找回巨费时,特记录如下;
执行:git reflog ----查看提交记录;挽回错误的重置,查看命令历史,用来记录你的每一次命令
git reset --hard (+rebase: updating HEAD 版本代码号)
git cherry-pick (+commit: ioc 版本代码号)
PS D:\yujie_web> git reflog
a012b29 (HEAD -> diff, master) HEAD@{0}: checkout: moving from master to diff
a012b29 (HEAD -> diff, master) HEAD@{1}: rebase finished: returning to refs/heads/master
a012b29 (HEAD -> diff, master) HEAD@{2}: rebase: table
776fe8d (origin/master, origin/HEAD) HEAD@{3}: rebase: checkout refs/remotes/origin/masterkout refs/remotes/origin/master
49a3524 HEAD@{4}: rebase: updating HEAD
49a3524 HEAD@{5}: rebase: aborting
1793050 HEAD@{6}: commit: ioc er
776fe8d (origin/master, origin/HEAD) HEAD@{7}: reba