Trusted, Bureaucrats
1,382
edits
Changes
Jump to navigation
Jump to search
First get an overview, over which commits should be squashed
git log
Let's say you wan't to squash the last 6 commits. Set HEAD~6+1. git rebase -i HEAD~67In the pop-up editor, for all the commits who should be squashed, replace all '''pick''' with '''s''' or '''squash'''. Do not change the '''pick''' for the first commit.Save and exit editor. Now compose a new commit message, which can be combined of the earlier commit messages. Comment out lines with "#" which should not be added.<brsource lang="text">Then make a commit git commit</source>
== See also ==
