git-18_squash commit

最新推荐文章于 2025-04-06 00:10:01 发布

原创最新推荐文章于 2025-04-06 00:10:01 发布 · 486 阅读

0 ·

CC 4.0 BY-SA版权

文章标签：

#git #squash

git 专栏收录该内容

25 篇文章

订阅专栏

博客涉及Git的Squash操作，但具体内容缺失。Git是常用的版本控制工具，Squash可将多个提交合并为一个，在代码管理中很实用。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

-- 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