Skip to main content

How to squash multiple commits into one?

Suppose you have commits as follows:

HEAD~0 --> Commit 5 eeeeeee
HEAD~1 --> Commit 4 ddddddd
HEAD~2 --> Commit 3 ccccccc
HEAD~3 --> Commit 2 bbbbbbb
HEAD~4 --> Commit 1 aaaaaaa

If you want to squash commits 3, 4 and 5 and make them as a single commit, run the commands below:

git rebase -i HEAD~3

3 means, you are squashing the last 3 commits. Update text in editor opened, save and close.

git push -f

Now, the commits would be as follows:

HEAD~0 --> Squashed Commit fffffff
HEAD~1 --> Commit 2 bbbbbbb
HEAD~2 --> Commit 1 aaaaaaa

Comments

Popular posts from this blog

How to install/upgrade/downgrade kubectl in Linux (Ubuntu)?

To install the latest version: curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" curl -LO "https://dl.k8s.io/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl.sha256" echo "$(<kubectl.sha256) kubectl" | sha256sum --check sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl kubectl version --client kubectl version To install a specific (v1.19.0) version: curl -LO "https://dl.k8s.io/release/v1.19.0/bin/linux/amd64/kubectl" curl -LO "https://dl.k8s.io/v1.19.0/bin/linux/amd64/kubectl.sha256" echo "$(<kubectl.sha256) kubectl" | sha256sum --check sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl kubectl version --client kubectl version This will install kubectl client. Run minikube start to install kubectl server.

Application Load Balancer (ALB)

The ALB spans all subnets in a VPC i.e., it is not inside a subnet but VPC. ALB is bound to Target Groups (TGs). TGs are bound to subnets.