Squash all of my commits into a single one and merge into master

Share this video with your friends

Send Tweet
Published 5 years ago
Updated 5 years ago

Often you have your feature branch you’ve been working on and once it’s ready, you just want it to merge into master as a single commit. You don’t care about all the single commit messages as they may not be relevant. There’s a nice “autosquash” feature in git which we’ll use in this lesson.

Instructor: [00:00] Our work on this app refactoring feature branch is done. We have made a couple of different kind of commits and we want to merge it now in master. We actually don't care about all of these commits. We just want to merge it in as one single commit. What we can do here is first of all we jump back to master, then we can use a feature called outer squash.

[00:22] We can do a Git merge squash of app refactoring into master. If you inspect a log just afterwards, we don't see it yet. We have to do a Git commit. Now we see the squashed commit of the following other commit messages, so add up folder, update readme, and a couple of other ones.

[00:40] Here on top we can define a message we would like, so add app refactoring for instance. Remove this one. We save it. As you can see in the Git log, we get now a commit add app refactoring which contains all of the commits of our app refactoring branch.

[00:56] Noted from the lock we can see that it didn't actually merge into app refactoring, but it created a new commit message which is this one here, add app refactoring, which is the sum of all the commits we created here in the app refactoring branch. That one can now be discarded because it won't be used anymore because we have already the changes on master now.

Phillip
Phillip
~ 5 years ago

Although Juri pointed out the branch wasn't actually merged per-se (only the steps turned into a new commit), the result is that you can't just git branch -d app-refactoring because it hasn't been merged (Of course you can do git branch -D app-refactoring). This is different than if you had just done git merge app-refactoring at the beginning.

Juri Strumpflohner
Juri Strumpflohnerinstructor
~ 5 years ago

@Philip totally, I agree. Alternatively you'd have to do it in separate steps, like polishing your branch commits first (also with autosquash in case) and then doing a normal merge.