JIYIK CN >

Once we have finished working on a branch, we usually don't need 合并to go into the existing files.

We often need to get some specific commits from different branches instead of dealing with all the commits in one particular branch. That is why we use git-cherry pickthe command in Git.

Difference between Git Git mergeand GitCherry-Pick commands

git mergeJust like Git cherry-pickcommand. Git cherry-pickcommand is used to assimilate changes from another branch to our desired branch.

When using mergethe command, we can usually assimilate all the changes done in another branch into the branch we want.

But on the other hand, sometimes we need to make only a few changes in the branch we want. For this, Git cherry-pickcommands are the safest choice.

Cherry-pickingBugfix commits in Git

Cherry-pickingThis can usually be interpreted as updating bug fixes to previous versions of our software, which means getting only a few explicit bug fix commits out of hundreds of bug fixes in a specific branch.

Then use that particular bug fix commit in future for any reason. This statement or command is mainly used when the team wants to fix some important bug in production or live web or desktop application.

Using this command, the team prepares the release and deploys it to production or live environment.

cherry-pickMultiple Commits in Git

In some cases, we want to apply to multiple commits in different branches at the same time cherry-pick. Then we have to first identify the two commits and use the following command on them.

Afterwards, this can be done over multiple commits using dot notation between the A and B branches cherry-picking, as shown in the following command:

$ git cherry-pick A..B

After applying this command, commit Ait will not be assimilated to cherry-pick.

To assimilate commit A, we can use the following syntax:

$ git cherry-pick A^..B

Use Rebasethe command to select the desired changes on a specific branch in Git

We have another way to rebaseselect the desired changes or commits in a particular branch using the -p command in Git. In this method, we can use the -p option onto``rebasecommand.

We can use it in two situations git rebase --onto:

• The first condition is that we have a branch that we want to replace its parent branch in the repository.
• Second, we want to immediately remove some commits from the current branch in the repository.

Assuming our branchis on Dthe branch that ends at , this is the desired branch we want to move C- Yto.

git reset --hard Y

git rebase --onto A B

It helps us to rebase from a specific point or commit to the desired commit. We can completely manage what to rebase and where to rebase in a specific branch commit.