JIYIK CN >

cherry-pickis a very useful command that is awesome and very useful in various scenarios while using Git. In Git, cherry-pickthe merge command allows us to merge sorted and detached commits from one branch into the current HEADbranch.

We can interpret as selecting a commit from a particular branch and transferring it to another branch. This command can be used to undo the changes of that branch. For example, if any commit is accidentally pushed to an unwanted branch. We can switch to the desired branch and select the place where the accidental commit was pushed to the desired branch.

When to use Gitcherry-pick

Git cherry-pickis a powerful tool, but it is not always the best choice. We should apply uncommon because it is easy to duplicate commits when cherry-pickwe merge commits into our branch using this command .HEAD

Git takes care of making a new commit with the same requirements as the last commit. Git should be used when we mistakenly commit new changes to the wrong branch and push it to the remote repository cherry-pick.

After pushing it to the remote repository, we realize that the pushed commit does not need to be pushed to a specific branch, so we have to use Git cherry-pickcommands to select that commit by its unique ID and transfer it to the correct branch.

Whenever we have the opportunity to apply a traditional Merge or Rebase to merge, we should consider it cherry-picking, because cherry-pickit must be reserved for the rare cases where a merge or rebase is not appropriate.

Git cherry-pickCommands

HEADWe just need to specify the commit we want to merge into our current branch from the commit we made on the wrong branch . et12x8iuIt is the commit ID we need to specify in order to merge it on the current branch.

Following are the commands to move the bad commit to the new latest commit.

$ git cherry-pick et12x8iu 

This way, we will commit the specified revision directly to our currently checked out branch.

Let's say our work still needs some modifications. In this case, we can also use Git commands to include only the committed changes to our main working copy without committing them directly. This way, it will go directly into the modified working copy and we can modify the files as needed.

Here are the commands to commit the bug to our working directory:

$ git cherry-pick et12x8iu --no-commit

Recovering deleted commits and undoing changes in Git

Sometimes 功能分支there are some complexities and it won't be merged into 当前分支, and sometimes a pull request may stall without being merged due to different work requirements.

What's special about Git is that it never loses track of these commits, and with a few commands like git logand git reflog, they can be tracked again and cherry-pickedput back where they should be.

We can say that option should not be used cherry-pickinstead of git mergeor git-rebase. git logThe command can be used to help cherry-pick commits into a specific branch.