git-18_squash commit

-- WARNING: It is possible to loose local commits -> if there are local commits present then do this procedure in a local branch , so that if you need to you can just delete your branch and try again. If all is good, you just merge your change back to your original branch.
-- Decide how many commits you are wanting to merge to one (replace NUMBEROFCOMMITS below with this number)
-- In general commits which are sequential in the commit log can be merged together (I would avoid trying to squash some commits which have other commits in between).
-- Rule of thumb - squash will use commit and meld it into a previous commit (Squash the newer into the older commit).
•	Whilst on your local repo do:
•	git log --pretty=oneline # take note of commit history on this branch
•	Decide how many commits you are wanting to merge to one
•	git rebase --interactive HEAD~NUMBEROFCOMMITS
-- An editor will appear, where you can assign which commits to pick, squash (and even remove).
-- once you save, your squash will be done
-- if something goes wrong you can start fresh again with
•	git rebase ---abort
•	git log # to make sure your log history with commits is what you want
  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

“相关推荐”对你有帮助么?

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

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

抵扣说明:

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

余额充值