gerrit/Documentation/cmd-cherry-pick.txt
Yuxuan 'fishy' Wang d85b687536 Bypass the rendering differences in AsciiDoctor.
AsciiDoctor have different understanding of [verse] with asciidoc, causing some
rendering differences. To get similar result with asciidoc, we use something
else instead of [verse] now.

Screenshots:
before:
http://imgur.com/JKMdBiv
after:
http://imgur.com/yFVvVac

Change-Id: I14e84f0e998e1e87b633681e8028ad657bde07e4
2013-11-15 11:47:46 -08:00

52 lines
1.4 KiB
Plaintext

gerrit-cherry-pick
==================
NAME
----
gerrit-cherry-pick - Download and cherry pick one or more changes
SYNOPSIS
--------
--
'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
---------