git rebase之后,本地commit记录丢失恢复

原文:https://blog.csdn.net/lxbwolf/article/details/52103974

问题描述:
提交代码时,rebase了两次,本地commit记录丢失了
解决方法:
git reflog
得到结果:
97f842a HEAD@{0}: rebase finished: returning to refs/heads/my_recovery_rule
97f842a HEAD@{1}: rebase: [routeplanrule] Changed query interfaces
2585748 HEAD@{2}: checkout: moving from my_recovery_rule to 25857484410570a1208bdc9a3a7ea4b84151c4a1^0
5175298 HEAD@{3}: checkout: moving from master to my_recovery_rule
2585748 HEAD@{4}: checkout: moving from my_recovery_rule to master
5175298 HEAD@{5}: commit (amend): [routeplanrule] Changed query interfaces
6c6245f HEAD@{6}: checkout: moving from all_key_date to my_recovery_rule
2585748 HEAD@{7}: checkout: moving from recovery_my_code to all_key_date
70baaef HEAD@{8}: checkout: moving from all_key_date to recovery_my_code
2585748 HEAD@{9}: checkout: moving from master to all_key_date
2585748 HEAD@{10}: checkout: moving from all_key_date to master
2585748 HEAD@{11}: checkout: moving from master to all_key_date
2585748 HEAD@{12}: checkout: moving from all_key_date to master
2585748 HEAD@{13}: rebase finished: returning to refs/heads/all_key_date
2585748 HEAD@{14}: checkout: moving from all_key_date to 25857484410570a1208bdc9a3a7ea4b84151c4a1^0
70baaef HEAD@{15}: commit (amend): [routeplanrule] Changed query interfaces
6c6245f HEAD@{16}: commit (amend): [routeplanrule] Changed query interfaces
6026046 HEAD@{17}: checkout: moving from master to all_key_date
2585748 HEAD@{18}: pull: Fast-forward
d3fc526 HEAD@{19}: checkout: moving from all_key_date to master
6026046 HEAD@{20}: commit: [routeplanrule] Changed query interfaces
d3fc526 HEAD@{21}: checkout: moving from master to all_key_date
d3fc526 HEAD@{22}: checkout: moving from new_temp_new to master
e1ab4e7 HEAD@{23}: checkout: moving from master to new_temp_new
d3fc526 HEAD@{24}: checkout: moving from new_temp_new to master
e1ab4e7 HEAD@{25}: checkout: moving from master to new_temp_new

只要新建一个分支,找回前一行commit的代码就可以了
$ git co -b my_recovery ci-id (测试过,可行)

git checkout -b my_recovery_branch 6c6245fbd95a58ac2ec2f0de3835f448b4ac8593
或者用reset (Suppose the old commit was HEAD@{5} in the ref log)

git reset --hard HEAD@{5} (测试过,可行)

  • 4
    点赞
  • 3
    收藏
    觉得还不错? 一键收藏
  • 3
    评论
评论 3
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值