Sourcetree squash 2 branch code#

Where is the hash of the commit just before the first one you want to rewrite from. Luckily, there is another way: git rebase -interactive I have tons of commits to squash, do I have to count them one by one?Ī downside of the git rebase -interactive HEAD~ command is that you have to guess the exact number of commits, by counting them one by one. So in this case the command would be: git rebase -interactive HEAD~īecause I want to combine the last seven commits into one, and d94e78 Prepare the workbench for feature Z is the seventh one.

Notice how a rebase generates a new commit with a new hash ( 84d1f8 in the example above). Obtaining: 84d1f8 Feature Z - newer commit (result of rebase)

Sourcetree squash 2 branch code#

For example, this is a hypothetical list of commits taken from the git log command, while I'm working on a generic feature Z: 871adf OK, feature Z is fully implemented - newer commitĭ94e78 Prepare the workbench for feature ZĪnd this is what I would like to do: 871adf OK, feature Z is fully implemented - newer commit -┐Ħ43d0e Code cleanup |- Join these into oneĭ94e78 Prepare the workbench for feature Z -┘ Where N is the number of commits you want to join, starting from the most recent one. The first thing to do is to invoke git to start an interactive rebase session: git rebase -interactive HEAD~N

It's a handy tool I use quite often I usually tidy up my working space by grouping together several small intermediate commits into a single lump to push upstream. In Git you can merge several commits into one with the powerful interactive rebase.