What is Git Squash?

 Git squash is a useful feature in version control that lets you combine multiple commits into a single, cleaner commit before merging them into a branch, such as master. It’s especially handy for keeping the commit history tidy and focused.

Let’s Understand with an Example

Imagine we have two branches in our repository:

  • Master branch: Contains commits: Commit 1, Commit 2, Commit 3.
  • Dev branch: Contains commits: Commit 4, Commit 5, Commit 6.

Now, suppose we only want to merge the changes from Commit 5 and Commit 6 into the master branch as a single commit, without including Commit 4.

This is where the git squash command comes in!

Steps to Squash Commits

Follow these simple steps:

  1. Switch to the master branch
  • git checkout master

2. Squash the commits from the dev branch
Use the following command to combine the latest two commits (Commit 5 and Commit 6) from the dev branch into a single commit and merge it into master:

  • git merge dev --squash HEAD~2
  • --squash: Combines the specified commits into one.
  • HEAD~2: Refers to the last two commits in the dev branch (in this case, Commit 5 and Commit 6).

Here is the YouTube Link: https://youtube.com/@raeesq.?si=v_QK6Q2XXMf9mKep

Why Use Git Squash?

Using Git squash ensures your commit history remains clean and concise. This is particularly helpful when working on a feature branch with several small, iterative commits. Instead of merging all these commits into the main branch, you can consolidate them into a single meaningful commit.

Try It Out!

Give it a shot, and you’ll see the magic of Git squash in action. It keeps your repository organized and makes it easier for your team to track changes.

Happy coding! 🎉

Comments

Post a Comment

Popular posts from this blog

📘 Understanding Prometheus in a Simple Way-Part 3 (For DevOps Beginners)

Image
 In our previous blogs, we have already covered: How to launch an EC2 instance (Link: https://medium.com/@raeesyaqubqazi/prometheus-and-grafana-project-part-1-by-raees-yaqoob-qazi-12eb5c431350 ) How to run our Notes App inside a Docker container (Link: https://medium.com/@raeesyaqubqazi/prometheus-and-grafana-project-part-1-by-raees-yaqoob-qazi-12eb5c431350 ) How to install cAdvisor to collect container-level metrics (Link: https://medium.com/@raeesyaqubqazi/monitoring-containers-with-cadvisor-part-2-of-my-previous-blog-series-cec2452b1ba5 ) Today, we will move one step ahead and learn Prometheus , which will collect the metrics generated by cAdvisor. 🔍 What Is Prometheus? Before understanding Prometheus, let’s talk about how data is stored in databases . ✔️ Relational Databases (MySQL, PostgreSQL) Data is stored in rows and columns  — like an Excel sheet. ✔️ Prometheus (TSDB — Time Series Database) Prometheus does NOT store data in tables.  It stores data in Time Series fo...
Read more

Grafana Setup & Dashboard Creation (Part-5)— Explained by Raees Yaqoob Qazi

Image
 Today, I’m going to talk about Grafana . Grafana is a powerful tool used to create dashboards and visualize data . As DevOps engineers, monitoring is very important, and Grafana makes it easy to understand system performance. Part-1:  https://brillertechnologies.blogspot.com/2025/11/prometheus-and-grafana-projectpart-1-by.html Part 2:  https://brillertechnologies.blogspot.com/2025/11/monitoring-containers-with-cadvisorpart.html Part 3:  https://brillertechnologies.blogspot.com/2025/12/understanding-prometheus-in-simple-way.html Part 4: https://brillertechnologies.blogspot.com/2025/12/understanding-prometheusmonitoring-made.html 1. Running Grafana Using Docker Compose First, I use Docker Compose to run Grafana. Open your docker-compose.yml file: vim docker-compose. yml Add the Grafana service: grafana: image: grafana/grafana-enterprise container_name: grafana restart: unless-stopped ports: - "3000:3000" Save and exit with:   :wq Then run: d...
Read more

My First Python Program: A Simple Calculator

Image
 Today, I am going to create a simple calculator using Python . This might be your first code ever , and honestly, this is also my first Python code . So don’t worry — we are learning together. Let’s start step by step. Step 1: Open VS Code First, open Visual Studio Code (VS Code) . Step 2: Create a Folder and a File Create a new folder (you can name it anything). Inside the folder, create a new file. In my case, I named the file first.py . 👉  .py is the file extension for Python , just like: .cpp for C++ .java for Java Step 3: Write the Python Code Now, write the following code in first.py : num1 = float ( input ( "Enter num 1: " ) ) # Taking first number from the user num2 = float ( input ( "Enter num 2: " ) ) # Taking second number from the user opr = input ( "Enter operator: " ) # User selects the operator (+, -, *) if opr = = "+" : # If operator is + output = num1 + num2 if opr = = "-" : # If operator is - ...
Read more