summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 13:59:51 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 13:59:51 -0700
commit8fb66e5074d5cdeeb08e304be977374501a0787d (patch)
treea10c25e0490f7bf43f512b7306ae0d5d50fbba01 /git-cherry-pick.txt
parentc94277e1611270b68bbf2d52c9679abe231cc459 (diff)
downloadgit-htmldocs-8fb66e5074d5cdeeb08e304be977374501a0787d.tar.gz
Autogenerated HTML docs for v1.7.7-138-g7f41b6
Diffstat (limited to 'git-cherry-pick.txt')
-rw-r--r--git-cherry-pick.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index 7cfa3d92a..2660a842f 100644
--- a/git-cherry-pick.txt
+++ b/git-cherry-pick.txt
@@ -9,6 +9,8 @@ SYNOPSIS
--------
[verse]
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
+'git cherry-pick' --reset
+'git cherry-pick' --continue
DESCRIPTION
-----------
@@ -110,6 +112,10 @@ effect to your index in a row.
Pass the merge strategy-specific option through to the
merge strategy. See linkgit:git-merge[1] for details.
+SEQUENCER SUBCOMMANDS
+---------------------
+include::sequencer.txt[]
+
EXAMPLES
--------
`git cherry-pick master`::