| OLD | NEW |
| 1 '\" t | 1 '\" t |
| 2 .\" Title: depot_tools_tutorial | 2 .\" Title: depot_tools_tutorial |
| 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.78.1 <http://docbook.sf.net/> |
| 5 .\" Date: 05/09/2014 | 5 .\" Date: 01/13/2015 |
| 6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
| 7 .\" Source: depot_tools 54dac93 | 7 .\" Source: depot_tools 379a889 |
| 8 .\" Language: English | 8 .\" Language: English |
| 9 .\" | 9 .\" |
| 10 .TH "DEPOT_TOOLS_TUTORIAL" "7" "05/09/2014" "depot_tools 54dac93" "Chromium depo
t_tools Manual" | 10 .TH "DEPOT_TOOLS_TUTORIAL" "7" "01/13/2015" "depot_tools 379a889" "Chromium depo
t_tools Manual" |
| 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 13 matching lines...) Expand all Loading... |
| 34 The Chromium \fBdepot_tools\fR(7) suite contains many git workflow\-enhancing to
ols which are designed to work together to enable anyone to wrangle the Chromium
codebase expertly\&. This tutorial explains how to do development on Chromium u
sing these tools\&. This will cover: | 34 The Chromium \fBdepot_tools\fR(7) suite contains many git workflow\-enhancing to
ols which are designed to work together to enable anyone to wrangle the Chromium
codebase expertly\&. This tutorial explains how to do development on Chromium u
sing these tools\&. This will cover: |
| 35 .sp | 35 .sp |
| 36 .RS 4 | 36 .RS 4 |
| 37 .ie n \{\ | 37 .ie n \{\ |
| 38 \h'-04'\(bu\h'+03'\c | 38 \h'-04'\(bu\h'+03'\c |
| 39 .\} | 39 .\} |
| 40 .el \{\ | 40 .el \{\ |
| 41 .sp -1 | 41 .sp -1 |
| 42 .IP \(bu 2.3 | 42 .IP \(bu 2.3 |
| 43 .\} | 43 .\} |
| 44 | |
| 45 Setting up | 44 Setting up |
| 46 .RE | 45 .RE |
| 47 .sp | 46 .sp |
| 48 .RS 4 | 47 .RS 4 |
| 49 .ie n \{\ | 48 .ie n \{\ |
| 50 \h'-04'\(bu\h'+03'\c | 49 \h'-04'\(bu\h'+03'\c |
| 51 .\} | 50 .\} |
| 52 .el \{\ | 51 .el \{\ |
| 53 .sp -1 | 52 .sp -1 |
| 54 .IP \(bu 2.3 | 53 .IP \(bu 2.3 |
| 55 .\} | 54 .\} |
| 56 | |
| 57 Getting the code | 55 Getting the code |
| 58 .RE | 56 .RE |
| 59 .sp | 57 .sp |
| 60 .RS 4 | 58 .RS 4 |
| 61 .ie n \{\ | 59 .ie n \{\ |
| 62 \h'-04'\(bu\h'+03'\c | 60 \h'-04'\(bu\h'+03'\c |
| 63 .\} | 61 .\} |
| 64 .el \{\ | 62 .el \{\ |
| 65 .sp -1 | 63 .sp -1 |
| 66 .IP \(bu 2.3 | 64 .IP \(bu 2.3 |
| 67 .\} | 65 .\} |
| 68 | |
| 69 TL;DR | 66 TL;DR |
| 70 .RE | 67 .RE |
| 71 .sp | 68 .sp |
| 72 .RS 4 | 69 .RS 4 |
| 73 .ie n \{\ | 70 .ie n \{\ |
| 74 \h'-04'\(bu\h'+03'\c | 71 \h'-04'\(bu\h'+03'\c |
| 75 .\} | 72 .\} |
| 76 .el \{\ | 73 .el \{\ |
| 77 .sp -1 | 74 .sp -1 |
| 78 .IP \(bu 2.3 | 75 .IP \(bu 2.3 |
| 79 .\} | 76 .\} |
| 80 | |
| 81 Creating / Uploading a CL | 77 Creating / Uploading a CL |
| 82 .RE | 78 .RE |
| 83 .sp | 79 .sp |
| 84 .RS 4 | 80 .RS 4 |
| 85 .ie n \{\ | 81 .ie n \{\ |
| 86 \h'-04'\(bu\h'+03'\c | 82 \h'-04'\(bu\h'+03'\c |
| 87 .\} | 83 .\} |
| 88 .el \{\ | 84 .el \{\ |
| 89 .sp -1 | 85 .sp -1 |
| 90 .IP \(bu 2.3 | 86 .IP \(bu 2.3 |
| 91 .\} | 87 .\} |
| 92 | |
| 93 Updating the code | 88 Updating the code |
| 94 .RE | 89 .RE |
| 95 .sp | 90 .sp |
| 96 .RS 4 | 91 .RS 4 |
| 97 .ie n \{\ | 92 .ie n \{\ |
| 98 \h'-04'\(bu\h'+03'\c | 93 \h'-04'\(bu\h'+03'\c |
| 99 .\} | 94 .\} |
| 100 .el \{\ | 95 .el \{\ |
| 101 .sp -1 | 96 .sp -1 |
| 102 .IP \(bu 2.3 | 97 .IP \(bu 2.3 |
| 103 .\} | 98 .\} |
| 104 | |
| 105 Managing multiple CLs | 99 Managing multiple CLs |
| 106 .RE | 100 .RE |
| 107 .sp | 101 .sp |
| 108 .RS 4 | 102 .RS 4 |
| 109 .ie n \{\ | 103 .ie n \{\ |
| 110 \h'-04'\(bu\h'+03'\c | 104 \h'-04'\(bu\h'+03'\c |
| 111 .\} | 105 .\} |
| 112 .el \{\ | 106 .el \{\ |
| 113 .sp -1 | 107 .sp -1 |
| 114 .IP \(bu 2.3 | 108 .IP \(bu 2.3 |
| 115 .\} | 109 .\} |
| 116 | |
| 117 Managing dependent CLs | 110 Managing dependent CLs |
| 118 .RE | 111 .RE |
| 119 .sp | 112 .sp |
| 120 .RS 4 | 113 .RS 4 |
| 121 .ie n \{\ | 114 .ie n \{\ |
| 122 \h'-04'\(bu\h'+03'\c | 115 \h'-04'\(bu\h'+03'\c |
| 123 .\} | 116 .\} |
| 124 .el \{\ | 117 .el \{\ |
| 125 .sp -1 | 118 .sp -1 |
| 126 .IP \(bu 2.3 | 119 .IP \(bu 2.3 |
| 127 .\} | 120 .\} |
| 128 | |
| 129 Example Walkthrough | 121 Example Walkthrough |
| 130 .RE | 122 .RE |
| 131 .sp | 123 .sp |
| 132 Please refer to the manpages (or \-\-help output) for details about any of the c
ommands mentioned in this tutorial\&. | 124 Please refer to the manpages (or \-\-help output) for details about any of the c
ommands mentioned in this tutorial\&. |
| 133 .if n \{\ | 125 .if n \{\ |
| 134 .sp | 126 .sp |
| 135 .\} | 127 .\} |
| 136 .RS 4 | 128 .RS 4 |
| 137 .it 1 an-trap | 129 .it 1 an-trap |
| 138 .nr an-no-space-flag 1 | 130 .nr an-no-space-flag 1 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 151 This tutorial assumes basic familiarity with git terminology and concepts\&. If
you need to brush up on these, the following are very good resources: | 143 This tutorial assumes basic familiarity with git terminology and concepts\&. If
you need to brush up on these, the following are very good resources: |
| 152 .sp | 144 .sp |
| 153 .RS 4 | 145 .RS 4 |
| 154 .ie n \{\ | 146 .ie n \{\ |
| 155 \h'-04'\(bu\h'+03'\c | 147 \h'-04'\(bu\h'+03'\c |
| 156 .\} | 148 .\} |
| 157 .el \{\ | 149 .el \{\ |
| 158 .sp -1 | 150 .sp -1 |
| 159 .IP \(bu 2.3 | 151 .IP \(bu 2.3 |
| 160 .\} | 152 .\} |
| 161 | |
| 162 \m[blue]\fBThink like (a) Git\fR\m[]\&\s-2\u[1]\d\s+2 | 153 \m[blue]\fBThink like (a) Git\fR\m[]\&\s-2\u[1]\d\s+2 |
| 163 \- A lighthearted overview of git\&. If you\(cqre sorta\-familiar with git, but
not | 154 \- A lighthearted overview of git\&. If you\(cqre sorta\-familiar with git, but
not |
| 164 \fIcomfortable\fR | 155 \fIcomfortable\fR |
| 165 with it, then give this a look\&. | 156 with it, then give this a look\&. |
| 166 .RE | 157 .RE |
| 167 .sp | 158 .sp |
| 168 .RS 4 | 159 .RS 4 |
| 169 .ie n \{\ | 160 .ie n \{\ |
| 170 \h'-04'\(bu\h'+03'\c | 161 \h'-04'\(bu\h'+03'\c |
| 171 .\} | 162 .\} |
| 172 .el \{\ | 163 .el \{\ |
| 173 .sp -1 | 164 .sp -1 |
| 174 .IP \(bu 2.3 | 165 .IP \(bu 2.3 |
| 175 .\} | 166 .\} |
| 176 | |
| 177 \m[blue]\fBGit Immersion Tutorial\fR\m[]\&\s-2\u[2]\d\s+2 | 167 \m[blue]\fBGit Immersion Tutorial\fR\m[]\&\s-2\u[2]\d\s+2 |
| 178 \- An in\-depth git tutorial\&. | 168 \- An in\-depth git tutorial\&. |
| 179 .RE | 169 .RE |
| 180 .sp | 170 .sp |
| 181 .RS 4 | 171 .RS 4 |
| 182 .ie n \{\ | 172 .ie n \{\ |
| 183 \h'-04'\(bu\h'+03'\c | 173 \h'-04'\(bu\h'+03'\c |
| 184 .\} | 174 .\} |
| 185 .el \{\ | 175 .el \{\ |
| 186 .sp -1 | 176 .sp -1 |
| 187 .IP \(bu 2.3 | 177 .IP \(bu 2.3 |
| 188 .\} | 178 .\} |
| 189 | |
| 190 \m[blue]\fBpcottle\(cqs Visual Git Branching\fR\m[]\&\s-2\u[3]\d\s+2 | 179 \m[blue]\fBpcottle\(cqs Visual Git Branching\fR\m[]\&\s-2\u[3]\d\s+2 |
| 191 \- An excellent interactive/graphical demo on how git handles commits, branches,
and shows the operations git performs on them\&. | 180 \- An excellent interactive/graphical demo on how git handles commits, branches,
and shows the operations git performs on them\&. |
| 192 .RE | 181 .RE |
| 193 .sp | 182 .sp |
| 194 .RS 4 | 183 .RS 4 |
| 195 .ie n \{\ | 184 .ie n \{\ |
| 196 \h'-04'\(bu\h'+03'\c | 185 \h'-04'\(bu\h'+03'\c |
| 197 .\} | 186 .\} |
| 198 .el \{\ | 187 .el \{\ |
| 199 .sp -1 | 188 .sp -1 |
| 200 .IP \(bu 2.3 | 189 .IP \(bu 2.3 |
| 201 .\} | 190 .\} |
| 202 | |
| 203 \m[blue]\fBPro Git book\fR\m[]\&\s-2\u[4]\d\s+2 | 191 \m[blue]\fBPro Git book\fR\m[]\&\s-2\u[4]\d\s+2 |
| 204 \- \(lqThe\(rq book for learning git from basics to advanced concepts\&. A bit d
ry, but very through\&. | 192 \- \(lqThe\(rq book for learning git from basics to advanced concepts\&. A bit d
ry, but very through\&. |
| 205 .RE | 193 .RE |
| 206 .sp | 194 .sp |
| 207 If you\(cqve tried these out and are still having some trouble getting started,
there are \fImany\fR other resources online which should help\&. If you\(cqre \f
Ireally\fR \fB\fIreally\fR\fR stuck, then chat up one of the Chromium infrastruc
ture team members for some pointers\&. | 195 If you\(cqve tried these out and are still having some trouble getting started,
there are \fImany\fR other resources online which should help\&. If you\(cqre \f
Ireally\fR \fB\fIreally\fR\fR stuck, then chat up one of the Chromium infrastruc
ture team members for some pointers\&. |
| 208 .PP | 196 .PP |
| 209 Litmus Test | 197 Litmus Test |
| 210 .RS 4 | 198 .RS 4 |
| 211 If you know what | 199 If you know what |
| 212 git add, | 200 git add, |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 .\} | 235 .\} |
| 248 .sp | 236 .sp |
| 249 .SS "BOOTSTRAPPING CONFIGURATION" | 237 .SS "BOOTSTRAPPING CONFIGURATION" |
| 250 .sp | 238 .sp |
| 251 If you have never used git before, you\(cqll need to set some global git configu
rations; substitute your name and email address in the following commands: | 239 If you have never used git before, you\(cqll need to set some global git configu
rations; substitute your name and email address in the following commands: |
| 252 .sp | 240 .sp |
| 253 .if n \{\ | 241 .if n \{\ |
| 254 .RS 4 | 242 .RS 4 |
| 255 .\} | 243 .\} |
| 256 .nf | 244 .nf |
| 257 \fB$ git config \-\-global user\&.name \(lqJohn Doe\(rq\fR | 245 \fB$ git config \-\-global user\&.name "John Doe"\fR |
| 258 \fB$ git config \-\-global user\&.email \(lqjdoe@email\&.com\(rq\fR | 246 \fB$ git config \-\-global user\&.email "jdoe@email\&.com"\fR |
| 259 \fB$ git config \-\-global core\&.autocrlf false\fR | 247 \fB$ git config \-\-global core\&.autocrlf false\fR |
| 260 \fB$ git config \-\-global core\&.filemode false\fR | 248 \fB$ git config \-\-global core\&.filemode false\fR |
| 261 \fB$\fR # and for fun! | 249 \fB$\fR # and for fun! |
| 262 \fB$ git config \-\-global color\&.ui true\fR | 250 \fB$ git config \-\-global color\&.ui true\fR |
| 263 .fi | 251 .fi |
| 264 .if n \{\ | 252 .if n \{\ |
| 265 .RE | 253 .RE |
| 266 .\} | 254 .\} |
| 267 .sp | 255 .sp |
| 268 .SH "TL;DR" | 256 .SH "TL;DR" |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 origin/master | 466 origin/master |
| 479 cool_feature | 467 cool_feature |
| 480 subfeature | 468 subfeature |
| 481 frozen_changes * | 469 frozen_changes * |
| 482 master | 470 master |
| 483 .fi | 471 .fi |
| 484 .if n \{\ | 472 .if n \{\ |
| 485 .RE | 473 .RE |
| 486 .\} | 474 .\} |
| 487 .sp | 475 .sp |
| 476 |
| 488 .PP | 477 .PP |
| 489 \fBgit-map\fR(1) | 478 \fBgit-map\fR(1) |
| 490 .RS 4 | 479 .RS 4 |
| 491 This tool shows you the history of all of your branches in a pseudo\-graphical f
ormat\&. In particular, it will show you which commits all of your branches are
on, which commit you currently have checked out, and more\&. Check out the doc f
or the full details\&. | 480 This tool shows you the history of all of your branches in a pseudo\-graphical f
ormat\&. In particular, it will show you which commits all of your branches are
on, which commit you currently have checked out, and more\&. Check out the doc f
or the full details\&. |
| 492 .RE | 481 .RE |
| 493 .PP | 482 .PP |
| 494 \fBgit-map-branches\fR(1) | 483 \fBgit-map-branches\fR(1) |
| 495 .RS 4 | 484 .RS 4 |
| 496 This tool just shows you which branches you have in your repo, and their upstrea
m relationship to each other (as well as which branch you have checked out at th
e moment)\&. | 485 This tool just shows you which branches you have in your repo, and their upstrea
m relationship to each other (as well as which branch you have checked out at th
e moment)\&. |
| 497 .RE | 486 .RE |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 .sp | 560 .sp |
| 572 Let\*(Aqs fix something! | 561 Let\*(Aqs fix something! |
| 573 .sp | 562 .sp |
| 574 .if n \{\ | 563 .if n \{\ |
| 575 .RS 4 | 564 .RS 4 |
| 576 .\} | 565 .\} |
| 577 .nf | 566 .nf |
| 578 \fB$ git new\-branch fix_typo\fR | 567 \fB$ git new\-branch fix_typo\fR |
| 579 \fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\
&.txt\fR | 568 \fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\
&.txt\fR |
| 580 1503 | 569 1503 |
| 581 1501 | |
| 582 It was a Domo\-Banana\&. | 570 It was a Domo\-Banana\&. |
| 583 It was a Domo\-Kuun\&. | 571 It was a Domo\-Kuun\&. |
| 572 1501 |
| 584 \fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR | 573 \fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR |
| 585 [fix_typo 615ffa7] Fix terrible typo\&. | 574 [fix_typo 615ffa7] Fix terrible typo\&. |
| 586 1 file changed, 1 insertion(+), 1 deletion(\-) | 575 1 file changed, 1 insertion(+), 1 deletion(\-) |
| 587 \fB$ git map\fR | 576 \fB$ git map\fR |
| 588 \fB* 615ffa7 \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix terrible typo\&. | 577 \fB* 615ffa7 \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix terrible typo\&. |
| 589 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm
pl use mailboxes\fB <(fix_typo)\fR | 578 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm
pl use mailboxes\fB <(fix_typo)\fR |
| 590 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on
uclibc builds | 579 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on
uclibc builds |
| 591 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi
th the request manager\&. | 580 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi
th the request manager\&. |
| 592 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd
le clicking the titlebar\&. | 581 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd
le clicking the titlebar\&. |
| 593 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR
enderView | 582 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR
enderView |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 .RS 4 | 634 .RS 4 |
| 646 .\} | 635 .\} |
| 647 .nf | 636 .nf |
| 648 \fB$ git freeze\fR | 637 \fB$ git freeze\fR |
| 649 \fB$ git checkout fix_typo\fR | 638 \fB$ git checkout fix_typo\fR |
| 650 Switched to branch \*(Aqfix_typo\*(Aq | 639 Switched to branch \*(Aqfix_typo\*(Aq |
| 651 Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. | 640 Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. |
| 652 (use "git push" to publish your local commits) | 641 (use "git push" to publish your local commits) |
| 653 \fB$ echo \-e \*(Aq/Kuun\ens/Kuun/Kun\enwq\*(Aq | ed build/whitespace_file\&.txt
\fR | 642 \fB$ echo \-e \*(Aq/Kuun\ens/Kuun/Kun\enwq\*(Aq | ed build/whitespace_file\&.txt
\fR |
| 654 1501 | 643 1501 |
| 655 1500 | |
| 656 It was a Domo\-Kuun\&. | 644 It was a Domo\-Kuun\&. |
| 657 It was a Domo\-Kun\&. | 645 It was a Domo\-Kun\&. |
| 646 1500 |
| 658 \fB$ git upstream\-diff \-\-wordwise\fR | 647 \fB$ git upstream\-diff \-\-wordwise\fR |
| 659 \fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt\fR | 648 \fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt\fR |
| 660 \fBindex 3eba355\&.\&.57cdcee 100644\fR | 649 \fBindex 3eba355\&.\&.57cdcee 100644\fR |
| 661 \fB\-\-\- a/build/whitespace_file\&.txt\fR | 650 \fB\-\-\- a/build/whitespace_file\&.txt\fR |
| 662 \fB+++ b/build/whitespace_file\&.txt\fR | 651 \fB+++ b/build/whitespace_file\&.txt\fR |
| 663 @@ \-17,7 +17,7 @@ swept up the streets (for it is in London that our scene lies
), rattling along | 652 @@ \-17,7 +17,7 @@ swept up the streets (for it is in London that our scene lies
), rattling along |
| 664 the housetops, and fiercely agitating the scanty flame of the lamps that | 653 the housetops, and fiercely agitating the scanty flame of the lamps that |
| 665 struggled against the elements\&. A hooded figure emerged\&. | 654 struggled against the elements\&. A hooded figure emerged\&. |
| 666 | 655 |
| 667 It was a Domo\-BananaKun\&. | 656 It was a Domo\-BananaKun\&. |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 changes and commit them, and you can discard any commits you make in this | 708 changes and commit them, and you can discard any commits you make in this |
| 720 state without impacting any branches by performing another checkout\&. | 709 state without impacting any branches by performing another checkout\&. |
| 721 | 710 |
| 722 If you want to create a new branch to retain commits you create, you may | 711 If you want to create a new branch to retain commits you create, you may |
| 723 do so (now or later) by using \-b with the checkout command again\&. Example: | 712 do so (now or later) by using \-b with the checkout command again\&. Example: |
| 724 | 713 |
| 725 git checkout \-b new_branch_name | 714 git checkout \-b new_branch_name |
| 726 | 715 |
| 727 HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes | 716 HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes |
| 728 \fB$ git nav\-downstream\fR | 717 \fB$ git nav\-downstream\fR |
| 718 Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes |
| 719 Switched to branch \*(Aqchap2\*(Aq |
| 720 Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. |
| 721 (use "git push" to publish your local commits) |
| 729 Please select a downstream branch | 722 Please select a downstream branch |
| 730 0\&. chap2 | 723 0\&. chap2 |
| 731 1\&. fix_typo | 724 1\&. fix_typo |
| 732 Selection (0\-1)[0]: 0 | 725 Selection (0\-1)[0]: 0 |
| 733 Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes | |
| 734 Switched to branch \*(Aqchap2\*(Aq | |
| 735 Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. | |
| 736 (use "git push" to publish your local commits) | |
| 737 \fB$ git map\-branches\fR | 726 \fB$ git map\-branches\fR |
| 738 origin/master | 727 origin/master |
| 739 \fB chap2 * | 728 \fB chap2 * |
| 740 \fR fix_typo | 729 \fR fix_typo |
| 741 .fi | 730 .fi |
| 742 .if n \{\ | 731 .if n \{\ |
| 743 .RE | 732 .RE |
| 744 .\} | 733 .\} |
| 745 .sp | 734 .sp |
| 746 Now we can pick up on chapter2 where we left off\&. | 735 Now we can pick up on chapter2 where we left off\&. |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1058 .IP " 6." 4 | 1047 .IP " 6." 4 |
| 1059 main Chromium waterfall | 1048 main Chromium waterfall |
| 1060 .RS 4 | 1049 .RS 4 |
| 1061 \%http://build.chromium.org | 1050 \%http://build.chromium.org |
| 1062 .RE | 1051 .RE |
| 1063 .IP " 7." 4 | 1052 .IP " 7." 4 |
| 1064 here | 1053 here |
| 1065 .RS 4 | 1054 .RS 4 |
| 1066 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 1055 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
| 1067 .RE | 1056 .RE |
| OLD | NEW |