What is the usage of pick in git?

In git, pick is often used in conjunction with cherry. The "cherry-pick" command is used to apply the specified commit to other branches. The syntax is "git cherry-pick commitHash"; this command also supports one transfer. Multiple commits to the current branch.

The operating environment of this article: Windows 10 system, Git version 2.30.0, Dell G3 computer.

What is the usage of pick in git

git cherry-pick can select one or several commit(s) in a certain branch to perform the operation (the object of the operation is commit). For example, suppose we have a stable version branch called v2.0, and there is also a development version branch v3.0. We cannot directly merge the two branches, which will cause confusion in the stable version, but we also want to add a v3 The functions in .0 have been transferred to v2.0, and cherry-pick can be used here.

is to re-submit an existing commit;

The function of the git cherry-pick command is to apply the specified commit (commit) to other branches.

$ git cherry-pick <commitHash>

The above command will apply the specified commitHash to the current branch. This will create a new commit on the current branch, but of course their hash will be different.

Usage is as follows:

git cherry-pick <commit id>

The common configuration items of the git cherry-pick command are as follows.

(1)-e, --edit

Open the external editor and edit the submission information.

(2)-n, --no-commit

Only update the work area and staging area, no new submissions will be generated.

(3)-x

Append a line (cherry picked from commit...) to the end of the submission information to facilitate later inspection of how the submission was generated.

(4)-s, --signoff

Append a line of the operator's signature to the end of the submission information to indicate who performed the operation.

(5)-m parent-number, --mainline parent-number

If the original commit is a merge node, resulting from the merge of two branches, then Cherry pick will fail by default, Because it doesn't know which branch of code changes should be adopted. The

-m configuration item tells Git which branch changes should be adopted. Its parameter parent-number is an integer starting from 1, representing the parent branch number of the original commit.

$ git cherry-pick -m 1 <commitHash>

The above command indicates that Cherry pick adopts commitHash changes from the parent branch numbered 1.

Generally speaking, parent branch No. 1 is the branch that accepts changes (the branch being merged into), and parent branch No. 2 is the branch that is the source of changes (the branch being merged from).

Recommended study: "Git Tutorial"

The above is the detailed content of What is the usage of pick in git?. For more information, please follow other related articles on the PHP Chinese website!