（Git ）从某次提交单独分离HEAD， 切换master导致代

1.终端 cd 到项目目录  git reflog 查看提交日志  找到最后一次在HEAD分支提交的记录

5ddc435 HEAD@{6}: commit: 1. 更换客服 //!< 最后一次在HEAD提交

6351b4b (HEAD) HEAD@{7}: checkout: moving from ae5f96ace5e9b3ce090928f0ebf3e1695ba9177c to 6351b4b2686233b08181805fb6eb3562fa363655

ae5f96a HEAD@{8}: checkout: moving from master to ae5f96ace5e9b3ce090928f0ebf3e1695ba9177c

affbe2d (origin/master, origin/HEAD, master) HEAD@{9}: commit: 1. 秒杀活动

6351b4b (HEAD) HEAD@{10}: commit: 1. 完成提现记录

ae5f96a HEAD@{11}: commit: 1. 修改BUG

4a60551 HEAD@{12}: commit: 1. 修改了bug

7af9452 HEAD@{13}: commit: 1. 完成我的微信

d5bc675 HEAD@{14}: commit: 1. 优化好礼规则显示Label

a34a5f8 HEAD@{15}: commit: 1. 完成签到功能

ab3f829 HEAD@{16}: commit: 1. 签到

6dd7a29 HEAD@{17}: commit: 1. 处理账户余额、总余额、冻结余额、销售金额 为空处理

a9af745 HEAD@{18}: commit: 1. 完成礼物专区 精品活动

58042ce HEAD@{19}: commit: 1. 修改H5返回按钮图标

fa96abe HEAD@{20}: commit: 1. 修改BUG

a16b6fe HEAD@{21}: commit: 1. 完成功能引导

135f6d7 HEAD@{22}: commit: 1. 修改bug

e3487d9 HEAD@{23}: commit: 1. 修改bug

bf452ea HEAD@{24}: commit: 1. 完成供应商推荐记录

7a37c5d HEAD@{25}: commit: 1. 完成推荐供应商

00a8643 HEAD@{26}: commit: 1. 优化分享代码

b89a0c8 HEAD@{27}: commit: 1. 删除不需要的代码

d35f207 HEAD@{28}: reset: moving to HEAD

d35f207 HEAD@{29}: commit: 1. 修改plist info

0ca67be HEAD@{30}: commit: 1. 修改BUG

4a55570 HEAD@{31}: commit: 1. 完成订单评价

ba72b40 HEAD@{32}: commit: 1. 修复bug

51ce1cc HEAD@{33}: commit: 1. 修复bug

51f17b2 HEAD@{34}: commit: 1. 更新icon

bc942f1 HEAD@{35}: reset: moving to HEAD

bc942f1 HEAD@{36}: commit: 1. 修改bug

2. git checkout  5ddc435

3. git checkout -b diff

4.git checkout master

5.git merge diff