Oleg Chursin
Posted on March 2, 2020
A really quick step-by-step guide on how to squash Git commits to make your PRs concise, easy to read, and hence easy to review.
Steps:
- Make sure your branch is up to date with the
main
branch. - Run
git rebase -i main
. - You should see a list of commits, each commit starting with the word "pick".
- Make sure the first commit says "pick" and change the rest from "pick" to "squash". -- This will squash each commit into the previous commit, which will continue until every commit is squashed into the first commit.
- Save and close the editor (press
Esc
key, type:w
and hitEnter
key) -- save a file and quit vim / Vi by pressingEsc
key, type:x
and hitEnter
key. - It will give you the opportunity to change the commit message.
- Save and close the editor again.
- Force push the squashed commit:
git push --force-with-lease origin
.
đź’– đź’Ş đź™… đźš©
Oleg Chursin
Posted on March 2, 2020
Join Our Newsletter. No Spam, Only the good stuff.
Sign up to receive the latest update from our blog.
Related
gitops Leveraging ArgoCD for Kubernetes Applications: Implementation, Use Cases, and Best Practices
November 28, 2024