diff options
| author |  Jean-Noël Avila <jn.avila@free.fr> | 2021-11-06 19:48:51 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-11-09 09:39:11 -0800 |
| commit | 49cbad0edd4dcf53e373e9fd27a9c36a41fb044e (patch) | |
| tree | 1277d6695052d575c0b2278b8f1706062a5db581 /Documentation/git-cherry-pick.txt | |
| parent | doc: split placeholders as individual tokens (diff) | |
| download | tgif-49cbad0edd4dcf53e373e9fd27a9c36a41fb044e.tar.xz | |
doc: express grammar placeholders between angle brackets
This discerns user inputs from verbatim options in the synopsis.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 5d750314b2..78dcc9171f 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/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 |