Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: man/man1/git-drover.1

Issue 507513002: Add some more context to git-drover tutorial. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « man/html/git-drover.html ('k') | man/man7/depot_tools.7 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 '\" t 1 '\" t
2 .\" Title: git-drover 2 .\" Title: git-drover
3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> 4 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
5 .\" Date: 08/20/2014 5 .\" Date: 08/25/2014
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools b2c2b1c 7 .\" Source: depot_tools f0a4926
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "GIT\-DROVER" "1" "08/20/2014" "depot_tools b2c2b1c" "Chromium depot_tools M anual" 10 .TH "GIT\-DROVER" "1" "08/25/2014" "depot_tools f0a4926" "Chromium depot_tools M anual"
11 .\" ----------------------------------------------------------------- 11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff 12 .\" * Define some portability stuff
13 .\" ----------------------------------------------------------------- 13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673 15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq 18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq ' 19 .el .ds Aq '
20 .\" ----------------------------------------------------------------- 20 .\" -----------------------------------------------------------------
(...skipping 18 matching lines...) Expand all
39 .sp 39 .sp
40 git drover is NOT IMPLEMENTED yet\&. See the EXAMPLE section for the equivalent sequence of commands to run\&. 40 git drover is NOT IMPLEMENTED yet\&. See the EXAMPLE section for the equivalent sequence of commands to run\&.
41 .SH "EXAMPLE" 41 .SH "EXAMPLE"
42 .sp 42 .sp
43 Before working with branches, you must \*(Aqgclient sync \-\-with_branch_heads\* (Aq at least once to fetch the branches\&. 43 Before working with branches, you must \*(Aqgclient sync \-\-with_branch_heads\* (Aq at least once to fetch the branches\&.
44 .sp 44 .sp
45 .if n \{\ 45 .if n \{\
46 .RS 4 46 .RS 4
47 .\} 47 .\}
48 .nf 48 .nf
49 # Make sure we have the most up\-to\-date branch sources\&.
50 \fB$ git fetch\fR
51
52 # Here\*(Aqs the commit we want to \*(Aqdrover\*(Aq\&.
49 \fB$ git log \-n 1 \-\-pretty=fuller\fR 53 \fB$ git log \-n 1 \-\-pretty=fuller\fR
50 commit d4bdf220b1b8d616ae71ab2d539f106f167c03e1 54 commit fd935aae549962611c2f178dc9026f23ae2ad9bd
51 Author: some\&.committer <some\&.committer@chromium\&.org> 55 Author: some\&.committer <some\&.committer@chromium\&.org>
52 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 56 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
53 Commit: some\&.committer <some\&.committer@chromium\&.org> 57 Commit: some\&.committer <some\&.committer@chromium\&.org>
54 CommitDate: Thu Apr 10 08:54:46 2014 +0000 58 CommitDate: Thu Apr 10 08:54:46 2014 +0000
55 59
56 This change needs to go to branch 9999 60 This change needs to go to branch 9999
61
62 # Checkout the branch we want to \*(Aqdrover\*(Aq to\&.
57 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR 63 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
58 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. 64 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
59 # DO NOT leave off the \*(Aq\-x\*(Aq flag 65
60 \fB$ git cherry\-pick \-x d4bdf220b1b8d616ae71ab2d539f106f167c03e1\fR 66 # Now do the \*(Aqdrover\*(Aq\&.
61 [drover_9999 6356f5a] This change needs to go to branch 9999 67 # IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag
68 \fB$ git cherry\-pick \-x fd935aae549962611c2f178dc9026f23ae2ad9bd\fR
69 [drover_9999 0f36796] This change needs to go to branch 9999
62 Author: some\&.committer <some\&.committer@chromium\&.org> 70 Author: some\&.committer <some\&.committer@chromium\&.org>
63 Date: Thu Apr 10 08:54:46 2014 +0000 71 Date: Thu Apr 10 08:54:46 2014 +0000
64 1 file changed, 1 insertion(+) 72 1 file changed, 1 insertion(+)
65 create mode 100644 modified_file 73 create mode 100644 modified_file
74
75 # That took the code authored by some\&.commiter and commited it to the
76 # branch by branch\&.maintainer (us)\&.
66 \fB$ git log \-n 1 \-\-pretty=fuller\fR 77 \fB$ git log \-n 1 \-\-pretty=fuller\fR
67 commit 6356f5a94785197320d59639e794b83783094329 78 commit 0f3679662379e7032957abcc7d63e96cec444ec7
68 Author: some\&.committer <some\&.committer@chromium\&.org> 79 Author: some\&.committer <some\&.committer@chromium\&.org>
69 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 80 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
70 Commit: branch\&.maintainer <branch\&.maintainer@chromium\&.org> 81 Commit: branch\&.maintainer <branch\&.maintainer@chromium\&.org>
71 CommitDate: Thu Apr 10 09:11:36 2014 +0000 82 CommitDate: Thu Apr 10 09:11:36 2014 +0000
72 83
73 This change needs to go to branch 9999 84 This change needs to go to branch 9999
74 85
75 (cherry picked from commit d4bdf220b1b8d616ae71ab2d539f106f167c03e1) 86 (cherry picked from commit fd935aae549962611c2f178dc9026f23ae2ad9bd)
87
88 # Looks good\&. Ship it!
76 \fB$ git cl upload\fR 89 \fB$ git cl upload\fR
77 # Get LGTM or TBR\&. 90 # Get LGTM or TBR\&.
78 \fB$ git cl land\fR 91 \fB$ git cl land\fR
92 # Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq
79 .fi 93 .fi
80 .if n \{\ 94 .if n \{\
81 .RE 95 .RE
82 .\} 96 .\}
83 .sp 97 .sp
84 .SH "SEE ALSO" 98 .SH "SEE ALSO"
85 .sp 99 .sp
86 \fBgit-cherry-pick\fR(1) 100 \fBgit-cherry-pick\fR(1)
87 .SH "CHROMIUM DEPOT_TOOLS" 101 .SH "CHROMIUM DEPOT_TOOLS"
88 .sp 102 .sp
89 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi st with the development of chromium and related projects\&. Download the tools f rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. 103 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi st with the development of chromium and related projects\&. Download the tools f rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
90 .SH "NOTES" 104 .SH "NOTES"
91 .IP " 1." 4 105 .IP " 1." 4
92 here 106 here
93 .RS 4 107 .RS 4
94 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 108 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
95 .RE 109 .RE
OLDNEW
« no previous file with comments | « man/html/git-drover.html ('k') | man/man7/depot_tools.7 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698