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

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

Issue 561433002: Clear up some git-drover docs confusion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 3 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/src/git-drover.txt » ('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: 09/05/2014 5 .\" Date: 09/09/2014
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools 2171f9c 7 .\" Source: depot_tools 6e7202b
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "GIT\-DROVER" "1" "09/05/2014" "depot_tools 2171f9c" "Chromium depot_tools M anual" 10 .TH "GIT\-DROVER" "1" "09/09/2014" "depot_tools 6e7202b" "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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 .sp 53 .sp
54 54
55 .sp 55 .sp
56 .if n \{\ 56 .if n \{\
57 .RS 4 57 .RS 4
58 .\} 58 .\}
59 .nf 59 .nf
60 # Make sure we have the most up\-to\-date branch sources\&. 60 # Make sure we have the most up\-to\-date branch sources\&.
61 \fB$ git fetch\fR 61 \fB$ git fetch\fR
62 62
63 # Here\*(Aqs the commit we want to \*(Aqdrover\*(Aq\&. 63 # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\& .
64 \fB$ git log \-n 1 \-\-pretty=fuller\fR 64 \fB$ git log \-n 1 \-\-pretty=fuller\fR
65 commit 14293306d7969cff815969e2502f47794a63fbc5 65 commit 0421d3583f73220c8f88b1a96898fcd81222fe73
66 Author: some\&.committer <some\&.committer@chromium\&.org> 66 Author: some\&.committer <some\&.committer@chromium\&.org>
67 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 67 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
68 Commit: some\&.committer <some\&.committer@chromium\&.org> 68 Commit: some\&.committer <some\&.committer@chromium\&.org>
69 CommitDate: Thu Apr 10 08:54:46 2014 +0000 69 CommitDate: Thu Apr 10 08:54:46 2014 +0000
70 70
71 This change needs to go to branch 9999 71 This change needs to go to branch 9999
72 72
73 # Checkout the branch we want to \*(Aqdrover\*(Aq to\&. 73 # Checkout the branch we want to \*(Aqdrover\*(Aq to\&.
74 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR 74 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
75 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. 75 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
76 76
77 # Now do the \*(Aqdrover\*(Aq\&. 77 # Now do the \*(Aqdrover\*(Aq\&.
78 # IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag 78 # IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag
79 \fB$ git cherry\-pick \-x 14293306d7969cff815969e2502f47794a63fbc5\fR 79 \fB$ git cherry\-pick \-x 0421d3583f73220c8f88b1a96898fcd81222fe73\fR
80 [drover_9999 3200a8c] This change needs to go to branch 9999 80 [drover_9999 5c0a17d] This change needs to go to branch 9999
81 Author: some\&.committer <some\&.committer@chromium\&.org> 81 Author: some\&.committer <some\&.committer@chromium\&.org>
82 Date: Thu Apr 10 08:54:46 2014 +0000 82 Date: Thu Apr 10 08:54:46 2014 +0000
83 1 file changed, 1 insertion(+) 83 1 file changed, 1 insertion(+)
84 create mode 100644 modified_file 84 create mode 100644 modified_file
85 85
86 # That took the code authored by some\&.commiter and commited it to the 86 # That took the code authored by some\&.committer and committed it to
87 # branch by branch\&.maintainer (us)\&. 87 # the branch by the person who drovered it (i\&.e\&. you)\&.
88 \fB$ git log \-n 1 \-\-pretty=fuller\fR 88 \fB$ git log \-n 1 \-\-pretty=fuller\fR
89 commit 3200a8cb2072a7c84aaba52baaecbf5e4d17ad00 89 commit 5c0a17dd382cd098182ac9f486ccd6b86c28d96e
90 Author: some\&.committer <some\&.committer@chromium\&.org> 90 Author: some\&.committer <some\&.committer@chromium\&.org>
91 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 91 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
92 Commit: branch\&.maintainer <branch\&.maintainer@chromium\&.org> 92 Commit: you <you@chromium\&.org>
93 CommitDate: Thu Apr 10 09:11:36 2014 +0000 93 CommitDate: Thu Apr 10 09:11:36 2014 +0000
94 94
95 This change needs to go to branch 9999 95 This change needs to go to branch 9999
96 96
97 (cherry picked from commit 14293306d7969cff815969e2502f47794a63fbc5) 97 (cherry picked from commit 0421d3583f73220c8f88b1a96898fcd81222fe73)
98 98
99 # Looks good\&. Ship it! 99 # Looks good\&. Ship it!
100 \fB$ git cl upload\fR 100 \fB$ git cl upload\fR
101 # Wait for LGTM or TBR it\&. 101 # Wait for LGTM or TBR it\&.
102 \fB$ git cl land\fR 102 \fB$ git cl land\fR
103 # Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq 103 # Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq
104 .fi 104 .fi
105 .if n \{\ 105 .if n \{\
106 .RE 106 .RE
107 .\} 107 .\}
(...skipping 16 matching lines...) Expand all
124 .nf 124 .nf
125 # Make sure we have the most up\-to\-date branch sources\&. 125 # Make sure we have the most up\-to\-date branch sources\&.
126 \fB$ git fetch\fR 126 \fB$ git fetch\fR
127 127
128 # Checkout the branch with the change we want to revert\&. 128 # Checkout the branch with the change we want to revert\&.
129 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR 129 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
130 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. 130 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
131 131
132 # Here\*(Aqs the commit we want to revert\&. 132 # Here\*(Aqs the commit we want to revert\&.
133 \fB$ git log \-n 1\fR 133 \fB$ git log \-n 1\fR
134 commit 4803efead17077ecd40440caef2e78d1c66098cf 134 commit 28bb44fa7f9d5e19b73a670ae923d3a96dec250a
135 Author: some\&.committer <some\&.committer@chromium\&.org> 135 Author: some\&.committer <some\&.committer@chromium\&.org>
136 Date: Thu Apr 10 08:54:46 2014 +0000 136 Date: Thu Apr 10 08:54:46 2014 +0000
137 137
138 This change is horribly broken\&. 138 This change is horribly broken\&.
139 139
140 # Now do the revert\&. 140 # Now do the revert\&.
141 \fB$ git revert 4803efead17077ecd40440caef2e78d1c66098cf\fR 141 \fB$ git revert 28bb44fa7f9d5e19b73a670ae923d3a96dec250a\fR
142 142
143 # That reverted the change and committed the revert\&. 143 # That reverted the change and committed the revert\&.
144 \fB$ git log \-n 1\fR 144 \fB$ git log \-n 1\fR
145 commit 52350f2809ce71352326f1518feae57ac5152f18 145 commit 4618467de1407aa159624015c8c8461ec35fbaf1
146 Author: branch\&.maintainer <branch\&.maintainer@chromium\&.org> 146 Author: you <you@chromium\&.org>
147 Date: Thu Apr 10 09:11:36 2014 +0000 147 Date: Thu Apr 10 09:11:36 2014 +0000
148 148
149 Revert "This change is horribly broken\&." 149 Revert "This change is horribly broken\&."
150 150
151 This reverts commit 4803efead17077ecd40440caef2e78d1c66098cf\&. 151 This reverts commit 28bb44fa7f9d5e19b73a670ae923d3a96dec250a\&.
152 152
153 # As with old drover, reverts are generally OK to commit without LGTM\&. 153 # As with old drover, reverts are generally OK to commit without LGTM\&.
154 \fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR 154 \fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR
155 \fB$ git cl land \-\-bypass\-hooks\fR 155 \fB$ git cl land \-\-bypass\-hooks\fR
156 .fi 156 .fi
157 .if n \{\ 157 .if n \{\
158 .RE 158 .RE
159 .\} 159 .\}
160 .sp 160 .sp
161 .RE 161 .RE
162 .SH "SEE ALSO" 162 .SH "SEE ALSO"
163 .sp 163 .sp
164 \fBgit-cherry-pick\fR(1) \fBgit-revert\fR(1) 164 \fBgit-cherry-pick\fR(1), \fBgit-revert\fR(1)
165 .SH "CHROMIUM DEPOT_TOOLS" 165 .SH "CHROMIUM DEPOT_TOOLS"
166 .sp 166 .sp
167 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\&. 167 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\&.
168 .SH "NOTES" 168 .SH "NOTES"
169 .IP " 1." 4 169 .IP " 1." 4
170 here 170 here
171 .RS 4 171 .RS 4
172 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 172 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
173 .RE 173 .RE
OLDNEW
« no previous file with comments | « man/html/git-drover.html ('k') | man/src/git-drover.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698