| OLD | NEW |
| 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 19f1c45 |
| 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 19f1c45" "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 Loading... |
| 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 1a8b608985de400c58f146dd148ae98e7a28b073 |
| 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 1a8b608985de400c58f146dd148ae98e7a28b073\fR |
| 69 [drover_9999 7de24cb] 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 7de24cb9703fad18871ebd836e78751e2dec3961 |
| 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 1a8b608985de400c58f146dd148ae98e7a28b073) |
| 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 |
| 79 .fi | 92 .fi |
| 80 .if n \{\ | 93 .if n \{\ |
| 81 .RE | 94 .RE |
| 82 .\} | 95 .\} |
| 83 .sp | 96 .sp |
| 84 .SH "SEE ALSO" | 97 .SH "SEE ALSO" |
| 85 .sp | 98 .sp |
| 86 \fBgit-cherry-pick\fR(1) | 99 \fBgit-cherry-pick\fR(1) |
| 87 .SH "CHROMIUM DEPOT_TOOLS" | 100 .SH "CHROMIUM DEPOT_TOOLS" |
| 88 .sp | 101 .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\&. | 102 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" | 103 .SH "NOTES" |
| 91 .IP " 1." 4 | 104 .IP " 1." 4 |
| 92 here | 105 here |
| 93 .RS 4 | 106 .RS 4 |
| 94 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 107 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
| 95 .RE | 108 .RE |
| OLD | NEW |