Skip to main content

How to Squash Commits in Git for a Cleaner Commit History

Introduction:

Maintaining a clean and organized commit history is essential for effective collaboration and understanding project progress. Git provides a powerful feature called "squash" that allows you to combine multiple small commits into a single, more meaningful commit. In this blog post, we will guide you through the process of squashing commits in Git, helping you create a more streamlined and coherent commit history.


Step 1: Switch to the Branch

First, make sure you are on the branch that contains the commits you want to squash. For example, if you're working on a feature branch named feature-branch, use the following command to switch to that branch:


git checkout feature-branch


Step 2: Determine the Commit Range

Decide on the range of commits you wish to squash. Identify the commit that will serve as the base for the squashed commit. To squash the last 3 commits, you can use the HEAD~3 notation. Execute the following command to initiate the interactive rebase:


git rebase -i HEAD~3


Step 3: Squash Commits

Git will open a text editor displaying the selected commits. The first commit will be marked as "pick". Replace the "pick" command with "squash" or its abbreviation "s" for the subsequent commits that you want to squash. For instance:


pick abcdef1 Commit message 1

s abcdef2 Commit message 2

s abcdef3 Commit message 3


Step 4: Save and Confirm

Save the changes and exit the editor. While doing so, you will be prompted to provide a new commit message that represents the resulting squashed commit. Craft a concise and descriptive message that captures the essence of the changes.


Step 5: Finalize the Squash

After confirming the commit message, Git will finalize the squash operation, combining the changes from the squashed commits into a single, cohesive commit.


Step 6: Push the Changes

Once the squash is complete, you need to push the branch with the squashed commits to the remote repository. Since the commit history has changed, you'll need to force push using the following command:


git push origin feature-branch --force


Conclusion:

By utilizing Git's squash feature, you can streamline your commit history, making it more coherent and easier to understand. Squashing commits is particularly useful for removing unnecessary details, hiding work-in-progress commits, or consolidating a series of related changes into a single commit. However, keep in mind that squashing commits alters the commit history, so exercise caution when collaborating with others or working on shared branches. With this knowledge, you're now equipped to leverage Git squash to maintain a cleaner and more organized commit history in your projects. Happy coding! 

Comments

Popular posts from this blog

Offline AI Coding in VSCode: Continue + Ollama Complete Setup Guide

Want GitHub Copilot-level code assistance — but fully offline, air-gapped, and private? This guide walks you through setting up Continue (a VSCode extension) with Ollama (a local model runner) so you get chat, autocomplete, and inline editing powered entirely by models running on your own machine. No internet required at runtime. Table of Contents What Are Continue and Ollama? Prerequisites & Hardware Requirements Choosing the Right Models Step 1 — Installing Ollama & Pulling Models Step 2 — Installing Continue in VSCode (Offline) Step 3 — Configuring config.yaml Step 4 — Disabling Telemetry Step 5 — Usage & Shortcuts Troubleshooting What Are Continue and Ollama? Continue is an open-source VSCode (and JetBrains) extension that adds AI-powered coding features directly into your editor — think chat, inline edits, and tab autocomplete. By default it can connect to Claude, GPT-4, or any API. But it also supports local providers , which is exactly what we want here. Ollama i...

Local LLM on Ubuntu (CPU-Only): Ollama + Qwen Coder + Open WebUI + RAG Setup

Local LLM on Ubuntu (CPU-Only): Ollama + Qwen Coder + Open WebUI + RAG Run a private, high-performance internal AI coding assistant on your own hardware—no GPU required. Feb 13, 2026 Qwen 2.5 Coder RAG Enabled Enterprise Ready Keeping your code and documents on your own infrastructure is the gold standard for enterprise security. By combining Ollama , Qwen Coder , and Open WebUI , we can build a production-grade AI assistant that respects your privacy. Environment: CPU-only Ubuntu server (e.g., i9/Threadripper) with 64GB+ RAM for smooth 14B model inference. 1. System Preparation First, update your local environment and install necessary dependencies: sudo apt update && sudo apt upgrade -y sudo apt install -y curl git ca-certificates lscpu 2. Ollama & Model Tuning Install Ollama and optimize the configuration for CPU-only inference by setting the thread count: ...

Defining tomcat and mysql server Amazon EC2 instance

-- Create new amazon ec2 instance http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EC2_GetStarted.html -- Give permisson to pem file chmod 400 mycertificate.pem -- Connect to EC2 instance ssh -i mycertificate.pem ubuntu@ec2-51-51-51-51.eu-west-1.compute.amazonaws.com -- Installation Oracle Java 1.8 $ wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-linux-x64.tar.gz $ tar -xzvf jdk-8u92-linux-x64.tar.gz $ sudo mkdir -p /usr/java/ $ sudo mv jdk1.8.0_92/ /usr/java/ $ sudo vim  /etc/profile         JAVA_HOME=/usr/java/jdk1.8.0_92         PATH=$PATH:$HOME/bin:$JAVA_HOME/bin         JRE_HOME=/usr/java/jdk1.8.0_92/jre         PATH=$PATH:$HOME/bin:$JRE_HOME/bin         export JAVA_HOME...