Join egghead, unlock knowledge.

Want more egghead?

This lesson is for members. Join us? Get access to all 3,000+ tutorials + a community with expert developers around the world.

Unlock This Lesson
1×
Become a member
to unlock all features

Level Up!

Access all courses & lessons on egghead today and lock-in your price for life.

Autoplay

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

    Juri StrumpflohnerJuri Strumpflohner
    gitgit

    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.

    Code

    Code

    Become a Member to view code

    You must be a Member to view code

    Access all courses and lessons, track your progress, gain confidence and expertise.

    Become a Member
    and unlock code for this lesson
    Transcript

    Transcript

    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.

    Discuss

    Discuss