Git rebase squash commits by hash

Question

I have a branch with around 10 commits. 3 of these are merge commits merging master to my branch and adding ~500 commits in between each time. Is there a way to squash commits that were made on the current branch in one? my history looks something like this:

ad54ef86 My Commit 1
ad54ef86 Merge commit
ad54ef86 Others' Commits
....500 more others' commits
ad54ef86 My Commit 2
ad54ef86 My Commit 3
ad54ef86 Merge commit
ad54ef86 Others' Commits
....500 more others' commits
ad54ef86 My Commit 4
...

Now doing git rebase -i HEAD~2000 and searching is a lot of work. It there a way around it?

EDIT: So this question is being tagged as a duplicate of Squashing last n commits together. That is clearly not my problem. I want to squash the last n commits made ONLY on my current branch AFTER I merge another branch in this branch and get all those commits in the way as well.

Possible duplicate of https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git — andreee, Jun 11 '18 at 13:57
Possible duplicate of [Squash my last X commits together using Git](https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git) — phd, Jun 11 '18 at 16:16

rdf · Accepted Answer · 2019-04-01T10:35:14.860

7

First, I would ask what is the purpose of your rebase? Do you want to eventually push your commits to the remote? Or, do you want to simply have your commits on top and just continue to work locally? Either way, I suggest you take the following steps:

create a new branch starting from your remote master branch. This will get you all the commits from the remote master.
Switch to the new branch.
Start cherry picking your commits from the old branch you described. It would help to know the hashes of your commits. This will get all the commits from master under your commits. Please note that the hashes of your commits in the new branch will be re-written.
If needed, you can now squash and push your commits to the remote.

Remember to do fetch and rebase next time you need to synchronize to the remote.

edited Apr 01 '19 at 10:35

answered Jun 11 '18 at 14:07

rdf

133
6

I have multiple commits called Merge master with current branch and fix this bug or remove unused code. I just want to have a clean history by squashing these 10-15 commits on my branch into 1-2. I think creating a new branch and cherrypicking might be the way to go. – ayushgp Jun 11 '18 at 18:40
remember to validate my answer so that I get to 50 reputation points :) I need those to be able to comment on questions – rdf Jun 12 '18 at 07:49

Git rebase squash commits by hash

1 Answers1