In this example, all changes of the “Feature2” are about the readme.md file. Instead, it turns all changes from the source branch, which is the feature branch in this scenario, into local changes in the working copy: $ git status Unlike a regular merge, when we execute the command git merge with the –squash option, Git won't automatically create a merge commit.

Now, we would like to merge the result back to the master branch with one single commit to keep the master branch clean: $ git checkout masterĪutomatic merge went well stopped before committing as requested In our feature branch, we've made four commits. * 172d2ed 23:28:56 +0200 BugFix #2 (Kai Yuan)Īs the output above shows, in this Git repository, we've implemented “Feature2” in the feature branch. Squashing by Merging With the –squash Option We've learned that we need to change the “ pick” commands into “ squash” in the editor, and then Git will do the squashing as we expected: $ git rebase -i 29976c5 Instead, we can just execute the command git rebase -i 29976c5. So, we don't have to count how many commits we need to squash. Now, let's say we would like to squash all commits and rebase onto the commit 29976c5 with the message: “ BugFix #1“. * cbd350d 23:26:19 +0200 Init commit (Kai Yuan)Īs the slog output shows, we've squashed the last four commits into one new commit, “ f9a9cd5“. Now, if we check the Git commit log once again: $ git slog

Successfully rebased and updated refs/heads/master.

If we save the change and exit the editor, Git will do the rebase following our instructions: $ git rebase -i HEAD~4ġ file changed, 1 insertion(+), 1 deletion(-)

Coda 2 git push after publish