summaryrefslogtreecommitdiffstats
path: root/Documentation/cmd-cherry-pick.txt
blob: de0b71b74a99f61fb0d96377f076368c0ace0c96 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
= gerrit-cherry-pick

== NAME
gerrit-cherry-pick - Download and cherry pick one or more changes

== SYNOPSIS
[verse]
--
_gerrit-cherry-pick_ <remote> <changeid>...
_gerrit-cherry-pick_ --continue | --skip | --abort
_gerrit-cherry-pick_ --close <remote>
--

== DESCRIPTION
Downloads the listed changes specified on the command line and
proceeds to cherry-pick them (rewriting commit SHA-1s as it goes)
onto the current branch.

If a merge failure prevents this from being completely automatic,
you will be asked to resolve the conflict and restart the command
with the `--continue` option.

Change ids may be specified as either the change id (e.g. 1234)
or as change id slash patch set number (e.g. 1234/8).  If the patch
set number is not supplied, `/1` is assumed.

The `--close` command line option is now deprecated, as closing
existing changes post cherry-pick is better handled simply by
ensuring link:user-changeid.html[Change-Id lines] are present in
each commit message.

== OBTAINING
To obtain the 'gerrit-cherry-pick' script use scp, curl or wget to
copy it to your local system:

----
  $ scp -p -P 29418 john.doe@review.example.com:bin/gerrit-cherry-pick ~/bin/

  $ curl -Lo ~/bin/gerrit-cherry-pick http://review.example.com/tools/bin/gerrit-cherry-pick
----

GERRIT
------
Part of link:index.html[Gerrit Code Review]

SEARCHBOX
---------