summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-19 12:49:37 -0700
committerJunio C Hamano <gitster@pobox.com>2019-07-19 12:49:37 -0700
commita42e033b20a199fda9e2d77917e9a32105d98bb8 (patch)
tree39604095440c01f69e9d670a241e120d89aff90d /git-cherry-pick.txt
parent0906e98c10b77ca498915c1d3206c1aa5aba0971 (diff)
downloadgit-htmldocs-a42e033b20a199fda9e2d77917e9a32105d98bb8.tar.gz
Autogenerated HTML docs for v2.22.0-545-g9c9b96
Diffstat (limited to 'git-cherry-pick.txt')
-rw-r--r--git-cherry-pick.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index 754b16ce0..83ce51aed 100644
--- a/git-cherry-pick.txt
+++ b/git-cherry-pick.txt
@@ -10,9 +10,7 @@ SYNOPSIS
[verse]
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
[-S[<keyid>]] <commit>...
-'git cherry-pick' --continue
-'git cherry-pick' --quit
-'git cherry-pick' --abort
+'git cherry-pick' (--continue | --skip | --abort | --quit)
DESCRIPTION
-----------