Copy commits from another branch in Git
When working in Git, we want to integrate a specific single commit from one branch into our current HEAD
branch. This could be because a customer wants some changes to the product or any reported bugs.
Either we committed it by mistake, or we don't want it in our previous branch anymore and want it in our current HEAD
branch instead.
The answer to the above question is CHERRY PICK. Therefore, in the next section, we will discuss cherry-pick
the command in detail.
Copy commits from another branch in Git
Extracting a specific commit from one branch and copying it into our current HEAD
branch is called cherry picking.
Git has a specific command for this, the git- cherry-pick
cherry-picking command. Another use of cherry-picking is to apply specific changes before we merge or develop a pull request.
This is useful for undoing changes.
This article will discuss cherry-picking a specific commit from one branch to another.
Use git log
the command to view the commit
First, we'll use git log
to investigate the commit we want to select. Here are git log
the branch results from the command:
d23216 - 953222 - 953219 - aa3s36 - 532d37 [master]
\
76cada - 66ecb3 - b886a0 [feature]
In feature
the branch, there is a commit from another branch 66ecb3
that we only want in our master
branch.
Let's cherry-pick that particular commit and move it to our current branch, master
the branch. We can then use that commit changes for our project in the future.
Run git cherry-pick
the command to copy the commit
Here, git cherry-pick
will help us. 66ecb3
is the cherry, we want to pick it from the huge number of pushes that have been done in the past.
Let's pick it from another branch by running the following command.
git checkout master
git cherry-pick 66ecb3
Once the commands listed above run successfully, 66ecb3
will now be available as a new commit in our master branch.
So Git copies the commit we need, master
containing the same commit message and changes on the branch. Finally, a new commit is created with a new ID.
Use git reset
the command to clean up other branches
If we switch to feature
the branch, we'll see the same commit in its old location. This is because Git has copied it to another branch instead of moving it.
It does not touch the original branch.
Now, to clean up and undo, we will use the command after checking out the desired branch git reset
.
$ git checkout Test
Switched to branch 'Test'
$ git reset --hard HEAD~1
HEAD is now at 66ecb3 Change the title and delete the error page
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
Git installation and establishment of local warehouse service
Publish Date:2025/04/05 Views:89 Category:Git
-
Git is a distributed version control system: the client does not only extract the latest version of the file snapshot, but also completely mirrors the original code repository. It has the following advantages: a. Since every extraction oper
git remote operation——multiple remote repositories for one project
Publish Date:2025/04/05 Views:131 Category:Git
-
Multiple remote repositories for a git project In our git project, the command to operate the remote repository information is $ git remote # 查看当前所有的远程仓库的名称 $ git remote -v # 查看远程仓库的名称和远程仓
Git cherry pick command usage
Publish Date:2025/04/05 Views:190 Category:Git
-
git cherry-pick is a powerful command that allows us to select an arbitrary Git commit by reference and attach it to the HEAD of the current working branch. Cherry picking is the act of picking a commit from one branch and applying it to an
Comparison between Git merge and Git rebase
Publish Date:2025/04/05 Views:171 Category:Git
-
The git rebase command may seem like Git wizardry to beginners, but if used carefully, it can actually make life easier for your development team. In this article, we compare git rebase with the related git merge command and identify all th
How to fix Git error Error: src refspec master does not match any
Publish Date:2025/04/05 Views:124 Category:Git
-
When using Git, we may encounter the error "src refspace master does not match any". Here's what the error means and how to fix it. What does src refspec master does not match any Mean in Git mean? We may encounter this error when we try to
Rebase local branch when pulling changes from remote repository branch in Git
Publish Date:2025/04/05 Views:144 Category:Git
-
This article will cover the basics of rebasing your local branch when pulling changes from a remote repository branch in Git. We use the version control system Git to track changes made to files. We commit changes in a local branch in our l
Undo Git Stash
Publish Date:2025/04/04 Views:187 Category:Git
-
This article explains how to make and save changes to a repository. Git allows you to save changes locally and push them to a server when needed. In Git, we don't use the term save , but commit . We use git add , git commit , and git stash
View a list of cache entries in Git
Publish Date:2025/04/04 Views:59 Category:Git
-
We often need to pause our work and focus on something else in our development environment. Therefore, we may need to temporarily save our current work and focus on a different one. We may want to resume our original work later. git stash T
Git stores specific files
Publish Date:2025/04/04 Views:115 Category:Git
-
This article will cover storing changes to only specific files in Git. In Git, when we make some changes in our working tree, we may have some changes which may or may not be staged in our local repo. We may now wish to save these changes f