Delete commits but keep changes in Git
This article outlines the steps necessary to undo a Git commit while preserving the changes introduced by the same commit. We'll cover two commands we can use that have the same effect.
Without further ado, let’s jump right in.
Remove commits but keep changes in Git
Let's explore this concept with an example.
Assuming we have a commit history in our repo like below, how can we remove the latest commit but keep the changes?
There are two approaches we can take to achieve our goal. Let's look at the first approach, which is the simplest.
Use the git reset command to remove commits and keep changes
We can undo a commit while preserving our changes using the git reset command as follows:
$ git reset HEAD~
This should remove the Update Config.py commit but keep the changes to the file. We can run the git log command to confirm our situation.
If you run the git status command you will see that you have unstaged changes. This does not necessarily mean that your files have changed.
When we use the git reset--soft command without the -p or --hard-p option , Git will undo the specified commit without changing the files affected by the commit.
You can add changes to the index and run git commit --amend--no-editthe command to remove changes from the index and mount them to the latest commit.
Alternatively, instead of deleting a commit, you can continue developing and run the command when you need to make a new commit git commit --amend. At this point, you will add your new modifications to the commit you want to delete, and you can also edit the commit message.
In short, Git allows us to undo a commit and keep the changes introduced by the same commit. We can use git resetthe git undo and git commit --amendgit commands to achieve our goal.
For reprinting, please send an email to 1244347461@qq.com for approval. After obtaining the author's consent, kindly include the source as a link.
Related Articles
Moving commits to another branch in Git
Publish Date：2025/04/01 Views：200 Category：Git
-
Git is a very useful and powerful tool in the modern software world. Many types of files and codes can be stored through branches and commits in Git. Branches are a different concept depending on the version control system you use. Many dev
Git push using SSH keys
Publish Date：2025/04/01 Views：94 Category：Git
-
SSH stands for Secure Shell. It is the key that provides us with the credentials to access the SSH network protocol. It provides access to remote servers between engines on an unsecured open network. It is used for transferring data, files,
Use Git Prune command to clean up Git repository
Publish Date：2025/04/01 Views：73 Category：Git
-
In this article, we will discuss git prune the command and its uses. We know that Git is very careful with our data. When we delete data like commits, Git doesn't easily lose them. This can lead to stale data piling up in our machines. This
Git diff shows diff details of uncommitted changes
Publish Date：2025/03/31 Views：105 Category：Git
-
This article outlines how we can get diff details of uncommitted work in Git. We use the git diff command to show the differences between various Git references, such as commits, the index, and the working tree. We can use this command to d
Staging area in Git
Publish Date：2025/03/31 Views：152 Category：Git
-
In this article, we will learn about the staging area in Git . Git is a version control system that maintains a history of changes made to a project directory. Git uses commits to track changes. Git has three internal management systems, on
Add all files in a folder to commit in Git
Publish Date：2025/03/31 Views：159 Category：Git
-
This article will discuss the necessary steps to add all of your files into one folder for submission. If you have a folder with a dozen files, adding the files one by one can be tedious. Fortunately, Git allows us to add all the contents o
Meaning of Fetch_Head in Git
Publish Date：2025/03/31 Views：64 Category：Git
-
This article defines Fetch_HEAD in Git . This reference is an integral part of the git pull command and is important when merging changes from a remote repository into a local repository or branch. If you're not sure what Fetch_Head means,
Get all branches in Git
Publish Date：2025/03/31 Views：63 Category：Git
-
This article discusses how to fetch all branches from a remote repository. The git fetch command is a useful utility when you want to download changes from a remote repository without having to update your local branches. Sometimes, you may
Clone a Git repository with a specific revision
Publish Date：2025/03/31 Views：83 Category：Git
-
This article discussed various methods that we can use to clone a Git repository with a specific revision or changeset. This comes in handy when you have a repository with large files and you only need a specific version of the code. Instea
