diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:53:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:53:38 -0800 |
| commit | 59a32b07d3e226cad19135aee37bf81c8849efc8 (patch) | |
| tree | 36b60b52ab5a116eed5ea4723dfa5559da7981a2 /git-cherry-pick.txt | |
| parent | f24d6b5b23d901f1da0026ce4b3f9c1e1b5e09f6 (diff) | |
| download | git-htmldocs-59a32b07d3e226cad19135aee37bf81c8849efc8.tar.gz | |
Autogenerated HTML docs for v2.34.1-182-ge7735
Diffstat (limited to 'git-cherry-pick.txt')
| -rw-r--r-- | git-cherry-pick.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 5d750314b..78dcc9171 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -8,7 +8,7 @@ git-cherry-pick - Apply the changes introduced by some existing commits SYNOPSIS -------- [verse] -'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] +'git cherry-pick' [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff] [-S[<keyid>]] <commit>... 'git cherry-pick' (--continue | --skip | --abort | --quit) @@ -81,8 +81,8 @@ OPTIONS described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op. --m parent-number:: ---mainline parent-number:: +-m <parent-number>:: +--mainline <parent-number>:: Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of |