Welcome to OGeek Q&A Community for programmer and developer-Open, Learning and Share
Welcome To Ask or Share your Answers For Others

Categories

0 votes
550 views
in Technique[技术] by (71.8m points)

git - Squash history but keep X most recent commits

I'm attempting to remove a large portion of our history in a remote branch, we need to keep the most recent history of ~20-50 commits.

The branch in question has >3500 commits, I have attempted the suggestions from how-to-delete-all-git-commits-except-the-last-five but I always end up with conflicts..

There's almost exclusively merge commits in the branch, is there a way to squash the first ~3500 commits and keep the most recent history only that doesn't cause conflicts with merges?


与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…
Welcome To Ask or Share your Answers For Others

1 Reply

0 votes
by (71.8m points)
等待大神答复

与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…
OGeek|极客中国-欢迎来到极客的世界,一个免费开放的程序员编程交流平台!开放,进步,分享!让技术改变生活,让极客改变未来! Welcome to OGeek Q&A Community for programmer and developer-Open, Learning and Share
Click Here to Ask a Question

...