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.
96 lines
3.4 KiB
Groff
96 lines
3.4 KiB
Groff
11 years ago
|
'\" t
|
||
|
|
.\" Title: git-drover
|
||
|
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
||
|
|
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
|
||
|
|
.\" Date: 08/20/2014
|
||
|
|
.\" Manual: Chromium depot_tools Manual
|
||
|
|
.\" Source: depot_tools b2c2b1c
|
||
|
|
.\" Language: English
|
||
|
|
.\"
|
||
|
|
.TH "GIT\-DROVER" "1" "08/20/2014" "depot_tools b2c2b1c" "Chromium depot_tools Manual"
|
||
|
|
.\" -----------------------------------------------------------------
|
||
|
|
.\" * 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-drover \- Apply a commit from the trunk to a release branch, or from one release branch to another\&.
|
||
|
|
.SH "SYNOPSIS"
|
||
|
|
.sp
|
||
|
|
.nf
|
||
|
|
\fIgit drover\fR
|
||
|
|
.fi
|
||
|
|
.sp
|
||
|
|
.SH "DESCRIPTION"
|
||
|
|
.sp
|
||
|
|
git drover is NOT IMPLEMENTED yet\&. See the EXAMPLE section for the equivalent sequence of commands to run\&.
|
||
|
|
.SH "EXAMPLE"
|
||
|
|
.sp
|
||
|
|
Before working with branches, you must \*(Aqgclient sync \-\-with_branch_heads\*(Aq at least once to fetch the branches\&.
|
||
|
|
.sp
|
||
|
|
.if n \{\
|
||
|
|
.RS 4
|
||
|
|
.\}
|
||
|
|
.nf
|
||
|
|
\fB$ git log \-n 1 \-\-pretty=fuller\fR
|
||
|
|
commit d4bdf220b1b8d616ae71ab2d539f106f167c03e1
|
||
|
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
||
|
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
||
|
|
Commit: some\&.committer <some\&.committer@chromium\&.org>
|
||
|
|
CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
||
|
|
|
||
|
|
This change needs to go to branch 9999
|
||
|
|
\fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
|
||
|
|
Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
|
||
|
|
# DO NOT leave off the \*(Aq\-x\*(Aq flag
|
||
|
|
\fB$ git cherry\-pick \-x d4bdf220b1b8d616ae71ab2d539f106f167c03e1\fR
|
||
|
|
[drover_9999 6356f5a] This change needs to go to branch 9999
|
||
|
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
||
|
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
create mode 100644 modified_file
|
||
|
|
\fB$ git log \-n 1 \-\-pretty=fuller\fR
|
||
|
|
commit 6356f5a94785197320d59639e794b83783094329
|
||
|
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
||
|
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
||
|
|
Commit: branch\&.maintainer <branch\&.maintainer@chromium\&.org>
|
||
|
|
CommitDate: Thu Apr 10 09:11:36 2014 +0000
|
||
|
|
|
||
|
|
This change needs to go to branch 9999
|
||
|
|
|
||
|
|
(cherry picked from commit d4bdf220b1b8d616ae71ab2d539f106f167c03e1)
|
||
|
|
\fB$ git cl upload\fR
|
||
|
|
# Get LGTM or TBR\&.
|
||
|
|
\fB$ git cl land\fR
|
||
|
|
.fi
|
||
|
|
.if n \{\
|
||
|
|
.RE
|
||
|
|
.\}
|
||
|
|
.sp
|
||
|
|
.SH "SEE ALSO"
|
||
|
|
.sp
|
||
|
|
\fBgit-cherry-pick\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
|