ICode9

精准搜索请尝试: 精确搜索
首页 > 其他分享> 文章详细

Git reset and rebase

2021-07-16 23:34:32  阅读:158  来源: 互联网

标签:reset git -- rebase Git branch commit ID change


Git reset
Some times we made many commit during PR , we want to combine them to one commit

We can see, I create 4 commits totally.

1 backup the branch to remember the commit ID , in case that you did something wrong , you can roll-back.

$ git branch APPSOL-121312_local

2 git branch -v . check the commit ID , the new branch has the same ID (b103a.....)

3 git reset --soft commit ID( this commit ID is the one before your change, please check the first picture, 819f7 is checkout from master branch).

This command make all of your change combine together, and re-build a new commit ID.

4 git status and git add ** and git diff --cached to see the change.

5 git commit -m " massage"

6 git push --force . (you must use --force) , other wise ,it will ask you to pull firstly. that will lead to conflict.

标签:reset,git,--,rebase,Git,branch,commit,ID,change
来源: https://www.cnblogs.com/anxbai/p/15022282.html

本站声明: 1. iCode9 技术分享网(下文简称本站)提供的所有内容,仅供技术学习、探讨和分享;
2. 关于本站的所有留言、评论、转载及引用,纯属内容发起人的个人观点,与本站观点和立场无关;
3. 关于本站的所有言论和文字,纯属内容发起人的个人观点,与本站观点和立场无关;
4. 本站文章均是网友提供,不完全保证技术分享内容的完整性、准确性、时效性、风险性和版权归属;如您发现该文章侵犯了您的权益,可联系我们第一时间进行删除;
5. 本站为非盈利性的个人网站,所有内容不会用来进行牟利,也不会利用任何形式的广告来间接获益,纯粹是为了广大技术爱好者提供技术内容和技术思想的分享性交流网站。

专注分享技术,共同学习,共同进步。侵权联系[81616952@qq.com]

Copyright (C)ICode9.com, All Rights Reserved.

ICode9版权所有