gerrit/Documentation/cmd-cherry-pick.txt
Edwin Kempin f178f27ab6 Include user in scp commands to copy commit hook and cherry-pick script
The Gerrit documentation provides an scp command to install a commit
hook that automatically generates Change-IDs and an scp command to
copy the gerrit-cherry-pick script. To successfully execute the
commands the user has to be specified, otherwise the commands fail
with 'Prohibited by Gerrit'. This change adds a user to the example
scp commands in the Gerrit documentation so that it's clear that a
user has to be specified.

Change-Id: I31dfc7e738b1d126b54839bb741c06112bbf8af5
Signed-off-by: Edwin Kempin <edwin.kempin@gmail.com>
2011-02-28 13:38:28 +01:00

48 lines
1.3 KiB
Plaintext

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 http://review.example.com/tools/bin/gerrit-cherry-pick
GERRIT
------
Part of link:index.html[Gerrit Code Review]