aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '44ae4fb5d4'
${ noResults }
depot_tools/man/man1/git-cherry-pick-upload.1

90 lines
3.2 KiB
Groff
Raw Normal View History Unescape Escape

Add git cherry picking extension This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch. This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts. BUG=387111 Review URL: https://codereview.chromium.org/397593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@286273 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
'\" t
.\" Title: git-cherry-pick-upload
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
Fix manpage creation error. When running make_docs.sh, I get the error: asciidoc: FAILED: manpage document title is mandatory make: *** [git-cherry-pick-upload.xml] Error 1 I don't fully understand why, or why this hasn't come up before, but it seems to be complaining about the formatting of "===" in git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on Precise. R=iannucci@google.com Review URL: https://codereview.chromium.org/489143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290939 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.\" Date: 08/20/2014
Add git cherry picking extension This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch. This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts. BUG=387111 Review URL: https://codereview.chromium.org/397593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@286273 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.\" Manual: Chromium depot_tools Manual
Fix manpage creation error. When running make_docs.sh, I get the error: asciidoc: FAILED: manpage document title is mandatory make: *** [git-cherry-pick-upload.xml] Error 1 I don't fully understand why, or why this hasn't come up before, but it seems to be complaining about the formatting of "===" in git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on Precise. R=iannucci@google.com Review URL: https://codereview.chromium.org/489143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290939 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.\" Source: depot_tools 8d3348f
Add git cherry picking extension This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch. This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts. BUG=387111 Review URL: https://codereview.chromium.org/397593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@286273 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.\" Language: English
.\"
Fix manpage creation error. When running make_docs.sh, I get the error: asciidoc: FAILED: manpage document title is mandatory make: *** [git-cherry-pick-upload.xml] Error 1 I don't fully understand why, or why this hasn't come up before, but it seems to be complaining about the formatting of "===" in git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on Precise. R=iannucci@google.com Review URL: https://codereview.chromium.org/489143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290939 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.TH "GIT\-CHERRY\-PICK\-U" "1" "08/20/2014" "depot_tools 8d3348f" "Chromium depot_tools Manual"
Add git cherry picking extension This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch. This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts. BUG=387111 Review URL: https://codereview.chromium.org/397593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@286273 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
git-cherry-pick-upload \- Upload the diff between a revision and its parent to rietveld\&.
.SH "SYNOPSIS"
.sp
.nf
Fix manpage creation error. When running make_docs.sh, I get the error: asciidoc: FAILED: manpage document title is mandatory make: *** [git-cherry-pick-upload.xml] Error 1 I don't fully understand why, or why this hasn't come up before, but it seems to be complaining about the formatting of "===" in git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on Precise. R=iannucci@google.com Review URL: https://codereview.chromium.org/489143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290939 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fIgit cherry\-pick\-upload\fR \-\-branch <remote_branch_name> <commit_hash>
Add git cherry picking extension This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch. This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts. BUG=387111 Review URL: https://codereview.chromium.org/397593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@286273 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.fi
.sp
.SH "DESCRIPTION"
.sp
Fix manpage creation error. When running make_docs.sh, I get the error: asciidoc: FAILED: manpage document title is mandatory make: *** [git-cherry-pick-upload.xml] Error 1 I don't fully understand why, or why this hasn't come up before, but it seems to be complaining about the formatting of "===" in git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on Precise. R=iannucci@google.com Review URL: https://codereview.chromium.org/489143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290939 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
git cherry\-pick\-upload is used to upload a cherry pick to rietveld\&. It uses your view of the remote to generate the diff between a revision and its parent, and then uploads that diff to rietveld\&.
Add git cherry picking extension This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch. This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts. BUG=387111 Review URL: https://codereview.chromium.org/397593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@286273 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.sp
The commit message is annotated with "(cherry picked from commit [parent sha1])" as if it were generated by git cherry\-pick \-x\&.
.SH "EXAMPLE"
.sp
.sp
.if n \{\
.RS 4
.\}
.nf
Fix manpage creation error. When running make_docs.sh, I get the error: asciidoc: FAILED: manpage document title is mandatory make: *** [git-cherry-pick-upload.xml] Error 1 I don't fully understand why, or why this hasn't come up before, but it seems to be complaining about the formatting of "===" in git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on Precise. R=iannucci@google.com Review URL: https://codereview.chromium.org/489143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290939 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fB$ git cherry\-pick\-upload \-h\fR
Add git cherry picking extension This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch. This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts. BUG=387111 Review URL: https://codereview.chromium.org/397593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@286273 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
usage: git_cherry_pick_upload\&.py [\-h] \-\-branch <branch> <commit>
positional arguments:
<commit> SHA to cherry pick\&.
optional arguments:
\-h, \-\-help show this help message and exit
\-\-branch <branch>, \-b <branch>
The upstream branch to cherry pick to\&.
Fix manpage creation error. When running make_docs.sh, I get the error: asciidoc: FAILED: manpage document title is mandatory make: *** [git-cherry-pick-upload.xml] Error 1 I don't fully understand why, or why this hasn't come up before, but it seems to be complaining about the formatting of "===" in git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on Precise. R=iannucci@google.com Review URL: https://codereview.chromium.org/489143003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290939 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fB$ git cherry\-pick\-upload \-b my_branch c02b7d24a066adb747fdeb12deb21bfa\fR
Add git cherry picking extension This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch. This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts. BUG=387111 Review URL: https://codereview.chromium.org/397593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@286273 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
Found parent revision: b96d69fda53845a205151613a9c4cc93
Loaded authentication cookies from \&.codereview_upload_cookies
Issue created\&. URL: https://codereview\&.chromium\&.org/1234567890
Uploading base_file for some/path/first\&.file: OK
Uploading some/path/first\&.file: OK
Uploading base_file for some/path/second\&.file: OK
Uploading some/path/second\&.file: OK
Uploading base_file for some/path/third\&.file: OK
Uploading some/path/third\&.file: OK
Finalizing upload: OK
.fi
.if n \{\
.RE
.\}
.sp
.SH "SEE ALSO"
.sp
\fBgit-cherry-pick\fR(1) \fBgit-cl-upload\fR(1)
.SH "CHROMIUM DEPOT_TOOLS"
.sp
Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
.SH "NOTES"
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE