71c4843436
Use -p option to preserve the permissions of the remote file, which are offered as 755 for executable scripts. Reported-by: Marek Zawirski <marek.zawirski@gmail.com> Change-Id: I2fc73fcfe2da644774e2e91e8015c31256ad341d Signed-off-by: Shawn O. Pearce <sop@google.com>
46 lines
1.2 KiB
Plaintext
46 lines
1.2 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 to copy it to
|
|
your local system:
|
|
|
|
$ scp -p -P 29418 gerrit.example.com:bin/gerrit-cherry-pick ~/bin/
|
|
|
|
GERRIT
|
|
------
|
|
Part of link:index.html[Gerrit Code Review]
|