Git使用[原意要新建分支提交但是误提交到原来分支恢复办法]

城东2026-07-09 8:51

原意要新建分支提交但是误提交到原来分支恢复办法

随着项目越来越复杂,分支越来越多,很多时候是在原来的项目分支简单修改好代码后推送到新的项目分支提交,但是这时候经常会犯错把应该推到新项目分支的代码又推到原来的项目分支了,这里介绍怎么恢复还原!

这里想要把GM001还原回2026-05-28这次提交,然后再把2026-07-08这次提交推送到GM02分支,涉及危险操作,雷达不动先复制一份文件夹虽然没有作用但是可以防止后悔一个上午:

接下来使用"git reset commit"指令恢复把代码恢复到上次提交:

bash 复制代码 
Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git log -5
commit ab77da246830bf3d85809a92cb40cbe74293eacc (HEAD -> GM001, origin/GM001)
Author: my <fffffffffffff@16c.com>
Date:   Wed Jul 8 10:57:16 2026 +0800

    完善基本功能

commit 6e5ff3cb3967092913a5ddbc221a38edffcc4bd1
Author: my <fffffffffffff@16c.com>
Date:   Thu May 28 10:30:31 2026 +0800

    修改了USB相关的操作，可以实现使用OTA升级

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git reset 6e5ff3cb3967092913a5ddbc221a38edffcc4bd1
Unstaged changes after reset:
M       aaaa/component/xc6xx_drivers/Drivers/CMSIS/Device/xc_m0_register/xc_reg_adc.h
M       aaaa/component/xc6xx_drivers/Drivers/USB/usb_driver/xc_hal_usb.c
M       aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_adc.c
M       aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_fmc_spi.c
M       aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_uart.c

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git status
On branch GM001
Your branch is behind 'origin/GM001' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   aaaa/component/xc6xx_drivers/Drivers/CMSIS/Device/xc_m0_register/xc_reg_adc.h
        modified:   aaaa/component/xc6xx_drivers/Drivers/USB/usb_driver/xc_hal_usb.c
        modified:   aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_adc.c

这时候git将恢复到上一次提交并且代码把最新提交的代码恢复到未提交的状态,接下来使用"git stash"指令把最后修改的代码推到堆栈中:

bash 复制代码 
Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git stash list

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git stash
warning: in the working copy of 'aaaa/project/product/rf24g_only_mouse/project/product/tri_mode_mouse/mdk/tri_mode_mouse.uvprojx', LF will be re
placed by CRLF the next time Git touches it
Saved working directory and index state WIP on GM001: 6e5ff3cb 修改了USB相关的操作，可以实现使用OTA升级

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git stash list
stash@{0}: WIP on GM001: 6e5ff3cb 修改了USB相关的操作，可以实现使用OTA升级

接下来把上一次的commit强制推送到远端让GM001的代码恢复正常:

bash 复制代码 
Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git status
On branch GM001
Your branch is behind 'origin/GM001' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

nothing to commit, working tree clean

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git log -2
commit 6e5ff3cb3967092913a5ddbc221a38edffcc4bd1 (HEAD -> GM001)
Author: my <fffffffffffff@16c.com>
Date:   Thu May 28 10:30:31 2026 +0800

    修改了USB相关的操作，可以实现使用OTA升级

commit 114f8983d4479684c17bdd330969fd6796f763a5
Author: my <fffffffffffff@16c.com>
Date:   Thu May 28 10:02:05 2026 +0800

    更新了版本号

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git push -f
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Powered by GITEE.COM [1.1.23]
remote: Set trace flag c44960a7
To https://gitee.com/ceeeeee/ccccccccccc.git
 + ab77da24...6e5ff3cb GM001 -> GM001 (forced update)

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git log -2
commit 6e5ff3cb3967092913a5ddbc221a38edffcc4bd1 (HEAD -> GM001, origin/GM001)
Author: my <fffffffffffff@16c.com>
Date:   Thu May 28 10:30:31 2026 +0800

    修改了USB相关的操作，可以实现使用OTA升级

commit 114f8983d4479684c17bdd330969fd6796f763a5
Author: my <fffffffffffff@16c.com>
Date:   Thu May 28 10:02:05 2026 +0800

    更新了版本号

这样GM001分支的操作就完成了,接下来先把堆栈中的数据恢复出来:

bash 复制代码 
Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git stash list
stash@{0}: WIP on GM001: 6e5ff3cb 修改了USB相关的操作，可以实现使用OTA升级

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git stash pop
On branch GM001
Your branch is up to date with 'origin/GM001'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   aaaa/component/xc6xx_drivers/Drivers/CMSIS/Device/xc_m0_register/xc_reg_adc.h
        modified:   aaaa/component/xc6xx_drivers/Drivers/USB/usb_driver/xc_hal_usb.c
        modified:   aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_adc.c
        modified:   aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_fmc_spi.c

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (8e64c48929356d6cc762e1677325c04a08ab53fc)

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)
$ git status
On branch GM001
Your branch is up to date with 'origin/GM001'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   aaaa/component/xc6xx_drivers/Drivers/CMSIS/Device/xc_m0_register/xc_reg_adc.h
        modified:   aaaa/component/xc6xx_drivers/Drivers/USB/usb_driver/xc_hal_usb.c
        modified:   aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_adc.c
        modified:   aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_fmc_spi.c

no changes added to commit (use "git add" and/or "git commit -a")

接下来就是常规的动作,把最后修改的代码切换到新的分支并且提交:

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)

$ git branch

  • GM001

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM001)

$ git checkout -b GM02

Switched to a new branch 'GM02'

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM02)

$ git status

On branch GM02

Changes not staged for commit:

(use "git add ..." to update what will be committed)

(use "git restore ..." to discard changes in working directory)

modified: aaaa/component/xc6xx_drivers/Drivers/CMSIS/Device/xc_m0_register/xc_reg_adc.h

modified: aaaa/component/xc6xx_drivers/Drivers/USB/usb_driver/xc_hal_usb.c

modified: aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_adc.c

modified: aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_fmc_spi.c

modified: aaaa/component/xc6xx_drivers/Drivers/xc_driver/xc_drv_uart.c

no changes added to commit (use "git add" and/or "git commit -a")

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM02)

$ git add .

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM02)

$ git commit -m "完善基本功能"

GM02 a1af6585 完善基本功能

33 files changed, 514 insertions(+), 340 deletions(-)

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM02)

$ git push

fatal: The current branch GM02 has no upstream branch.

To push the current branch and set the remote as upstream, use

复制代码 
git push --set-upstream origin GM02

To have this happen automatically for branches without a tracking

upstream, see 'push.autoSetupRemote' in 'git help config'.

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM02)

$ git push --set-upstream origin GM02

Enumerating objects: 130, done.

Counting objects: 100% (130/130), done.

Delta compression using up to 20 threads

Compressing objects: 100% (61/61), done.

Writing objects: 100% (77/77), 84.31 KiB | 6.49 MiB/s, done.

Total 77 (delta 55), reused 12 (delta 10), pack-reused 0 (from 0)

remote: Powered by GITEE.COM 1.1.23

remote: Set trace flag 624274b3

remote: Create a pull request for 'GM02' on Gitee by visiting:

remote: https://gitee.com/ceeeeee/ccccccccccc/pull/new/ceeeeee:GM02...ceeeeee:master

To https://gitee.com/ceeeeee/ccccccccccc.git

  • new branch GM02 -> GM02
    branch 'GM02' set up to track 'origin/GM02'.

Administrator@HCAIA-WAQHGBEKP MINGW64 /d/xxxx/nnn/mmm/GM02/ccccccccccc (GM02)

$ git stash list

复制代码 
到这里整个工作就做完了:
![在这里插入图片描述](https://i-blog.csdnimg.cn/direct/d1d11d4a49dc4ae492f1d740d2cc7db5.png)
![在这里插入图片描述](https://i-blog.csdnimg.cn/direct/149f3a711273453fa1631f711b0de023.png)
相关推荐
麻辣布丁5 小时前
Git冲突原因与解决方法全解
大数据·git·elasticsearch
一支黑色の铅笔9 小时前
VSCode 克隆Git项目
ide·git·vscode
拽着尾巴的鱼儿11 小时前
Idea：Cannot Run Git 无法运行git
java·git·intellij-idea
y小川15 小时前
【git】移除远端已删除的git分支
git
OsDepK1 天前
项目快速Git至仓库（完整版）
大数据·git·elasticsearch·搜索引擎
妙码生花1 天前
使用git更新ai-go-admin框架
前端·人工智能·git·golang·typescript·php
朝阳5811 天前
如何用 AI 自动生成规范的 Git 提交信息：从暂存区 diff 到 Conventional Commit
人工智能·git
hudawei9961 天前
有未保存的修改，不能切换分支
git·git stash·stash
康一夏1 天前
Git Commit 规范实践：Angular Commit 规范 + Commitlint 自动化验证
git·自动化·commit msg·commit规范
LayZhangStrive1 天前
Git - 使用IDEA和git上传本地项目到Gitee远程仓库
git·gitee·idea
热门推荐
01国内可直接用、免费额度/永久免费的大模型API清单（含 SiliconFlow、火山、阿里、智谱、百度、Kimi、DeepSeek、DMXAPI 等）02如何新建文件夹？ 电脑新建文件夹的4种方法03GitHub 镜像站点04历年考研数学一、数学二、数学三真题试卷及答案PDF052026 国产 AI 大模型横评：DeepSeek、通义千问、Kimi、文心一言、星火、豆包谁更能打？06蜘蛛磁力 搜索引擎大全，如何使用蜘蛛磁力查找磁力链接07微信历史版本含下载地址（ Windows PC | 安卓 | MAC ）及设置微信不更新08ZCode 周末送额度活动开启：3 亿 Token 免费领取09AI 编程 IDE 全景解析 2026：Agent 全面接管开发链路10Agnes AI 免费 API 接入指南：文本、生图、生视频，一套接口全免费