Merge specific commits in Git
This article will discuss how to merge specific commits in Git. This comes in handy when we want to move the commits of our choice to a different branch while working on a project.
Let’s get right into it.
Merge specific commits in Git
Following are the four steps we use when merging specific commits in Git.
-
Fetch changes from a remote repository
We use
git fetchthe command to download any changes made to the remote repository to our local computer.git fetchPlease note that the above command only imports the changes and stores them in the local repository. It does not merge the commits.
-
Confirm commit hash
You'll need the commit hashes of the commits you want to merge. Follow those in order.
Switch to the branch that contains the commit you want.
git checkout <branch-name>Run
git logthe command to see a list of commits in that branch. Use--onelinethe -p argument to get a compact view.git log --oneline -
Merge commit
Note the hash of the commit you want to merge and switch to the target branch. Use
git checkoutthe command.git checkout <branch-name>Use
git cherry-pickthe command to merge the commits you want with the current branch.git cherry-pick <sha1-commit-hash> -
Pushing a branch
We can now run
git pushthe command to push the changes to the remote repository.git push origin <branch-name>It is worth noting that we use
git mergethe command to merge two Git branches. We can also use the command to merge multiple commits into one history.
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
Run a batch (.bat) file in CMD
Publish Date：2025/04/21 Views：169 Category：OPERATING SYSTEM
-
This article will show you how to use CMD to run a batch file.bat. There are three ways in which you can run a batch file. Let us discuss them in the following sections. Run batch (.bat) files in CMD by directly clicking on them This way yo
Running batch scripts using Task Scheduler
Publish Date：2025/04/21 Views：188 Category：OPERATING SYSTEM
-
This article will show you how to use Task Scheduler to run a batch file. Running batch scripts using Task Scheduler With Task Scheduler, you can automate tasks to run automatically at specific times. It only takes a few steps and you don't
Solve the error Make Command Not Found in Cygwin
Publish Date：2025/04/21 Views：75 Category：OPERATING SYSTEM
-
Cygwin allows Windows users to access certain Linux features and includes a large number of GNU and open source tools that are commonly found in popular Linux distributions. When using Cygwin, it is easy to encounter a command not found err
Difference between Bash Nohup and &
Publish Date：2025/04/21 Views：188 Category：OPERATING SYSTEM
-
This short article introduces the nohup command and the control operator to run Linux processes in the background through Bash. In addition, we will further study the key differences between nohup and . Running Linux processes in the backgr
Bash Nohup 与 & 的区别
Publish Date：2025/04/21 Views：186 Category：OPERATING SYSTEM
-
这篇简短的文章介绍了通过 Bash 在后台运行 Linux 进程的 nohup 命令和 控制运算符。 此外，我们将进一步研究 nohup 和 之间的主要区别。 在后台运行 Linux 进程 Linux 提供了两种在后台运行
Getting Timestamp in Bash
Publish Date：2025/04/21 Views：147 Category：OPERATING SYSTEM
-
This article discusses the date Bash command used to obtain the system date/time and UNIX timestamp. Get Timestamp Using date Command in Bash The Linux terminal uses the date command to print the current date and time. The simplest version
Pretty Printing JSON in Shell Script
Publish Date：2025/04/21 Views：145 Category：OPERATING SYSTEM
-
JSON is a textual method for representing JavaScript object literals and arrays and scalar data. It is relatively easier to read and write, and easier for manageable software to parse and generate. JSON is commonly used to serialize structu
Batch checks whether the specified environment variable contains a substring
Publish Date：2025/04/21 Views：72 Category：OPERATING SYSTEM
-
This article discusses how to use the Batch command to test whether an environment variable contains a specific substring. We will introduce two batch scripts that can be used in the above scenario. Checks whether the specified environment
Find the current folder name in Bash
Publish Date：2025/04/21 Views：189 Category：OPERATING SYSTEM
-
Finding a directory is very easy through Bash scripting. But finding the exact directory folder name you are in right now is a bit complicated. This article will introduce three methods to find the folder name from this article directory. I
