@ -1,13 +1,13 @@
'\" t
. \" Title: depot_tools_tutorial
. \" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
. \" Generator: DocBook XSL Stylesheets v1.7 6 .1 <http://docbook.sf.net/>
. \" Date: 0 5/09/2014
. \" Generator: DocBook XSL Stylesheets v1.7 8 .1 <http://docbook.sf.net/>
. \" Date: 0 1/13/2015
. \" Manual: Chromium depot_tools Manual
. \" Source: depot_tools 54dac93
. \" Source: depot_tools 379a889
. \" Language: English
. \"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "0 5/09/2014" "depot_tools 54dac93 " "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "0 1/13/2015" "depot_tools 379a889 " "Chromium depot_tools Manual"
. \" -----------------------------------------------------------------
. \" * Define some portability stuff
. \" -----------------------------------------------------------------
@ -41,7 +41,6 @@ The Chromium \fBdepot_tools\fR(7) suite contains many git workflow\-enhancing to
.sp -1
.IP \(bu 2 .3
. \}
Setting up
.RE
.sp
@ -53,7 +52,6 @@ Setting up
.sp -1
.IP \(bu 2 .3
. \}
Getting the code
.RE
.sp
@ -65,7 +63,6 @@ Getting the code
.sp -1
.IP \(bu 2 .3
. \}
TL;DR
.RE
.sp
@ -77,7 +74,6 @@ TL;DR
.sp -1
.IP \(bu 2 .3
. \}
Creating / Uploading a CL
.RE
.sp
@ -89,7 +85,6 @@ Creating / Uploading a CL
.sp -1
.IP \(bu 2 .3
. \}
Updating the code
.RE
.sp
@ -101,7 +96,6 @@ Updating the code
.sp -1
.IP \(bu 2 .3
. \}
Managing multiple CLs
.RE
.sp
@ -113,7 +107,6 @@ Managing multiple CLs
.sp -1
.IP \(bu 2 .3
. \}
Managing dependent CLs
.RE
.sp
@ -125,7 +118,6 @@ Managing dependent CLs
.sp -1
.IP \(bu 2 .3
. \}
Example Walkthrough
.RE
.sp
@ -158,7 +150,6 @@ This tutorial assumes basic familiarity with git terminology and concepts\&. If
.sp -1
.IP \(bu 2 .3
. \}
\m[blue]\fBThink like (a) Git\fR\m[]\&\s-2\u[1] \d \s +2
\- A lighthearted overview of git\& . If you\(cq re sorta\- familiar with git, but not
\fI comfortable\fR
@ -173,7 +164,6 @@ with it, then give this a look\&.
.sp -1
.IP \(bu 2 .3
. \}
\m[blue]\fBGit Immersion Tutorial\fR\m[]\&\s-2\u[2] \d \s +2
\- An in\- depth git tutorial\& .
.RE
@ -186,7 +176,6 @@ with it, then give this a look\&.
.sp -1
.IP \(bu 2 .3
. \}
\m[blue]\fBpcottle\(cqs Visual Git Branching\fR\m[]\&\s-2\u[3] \d \s +2
\- An excellent interactive/graphical demo on how git handles commits, branches, and shows the operations git performs on them\& .
.RE
@ -199,7 +188,6 @@ with it, then give this a look\&.
.sp -1
.IP \(bu 2 .3
. \}
\m[blue]\fBPro Git book\fR\m[]\&\s-2\u[4] \d \s +2
\- \(lq The\(rq book for learning git from basics to advanced concepts\& . A bit dry, but very through\& .
.RE
@ -254,8 +242,8 @@ If you have never used git before, you\(cqll need to set some global git configu
.RS 4
. \}
.nf
\fB $ git config \- \- global user\& .name \(lq John Doe\(rq \fR
\fB $ git config \- \- global user\& .email \(lq jdoe@email\& .com\(rq \fR
\fB $ git config \- \- global user\& .name "John Doe" \fR
\fB $ git config \- \- global user\& .email "jdoe@email\& .com" \fR
\fB $ git config \- \- global core\& .autocrlf false\fR
\fB $ git config \- \- global core\& .filemode false\fR
\fB $\fR # and for fun!
@ -485,6 +473,7 @@ origin/master
.RE
. \}
.sp
.PP
\fB git-map\fR (1)
.RS 4
@ -578,9 +567,9 @@ Let\*(Aqs fix something!
\fB $ git new\- branch fix_typo\fR
\fB $ echo \- e \* (Aq/Banana\e ns/Banana/Kuun\e nwq\* (Aq | ed build/whitespace_file\& .txt\fR
1503
1501
It was a Domo\- Banana\& .
It was a Domo\- Kuun\& .
1501
\fB $ git commit \- am \* (AqFix terrible typo\& .\* (Aq\fR
[fix_typo 615ffa7] Fix terrible typo\& .
1 file changed, 1 insertion(+), 1 deletion(\- )
@ -652,9 +641,9 @@ Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
(use "git push" to publish your local commits)
\fB $ echo \- e \* (Aq/Kuun\e ns/Kuun/Kun\e nwq\* (Aq | ed build/whitespace_file\& .txt\fR
1501
1500
It was a Domo\- Kuun\& .
It was a Domo\- Kun\& .
1500
\fB $ git upstream\- diff \- \- wordwise\fR
\fB diff \- \- git a/build/whitespace_file\& .txt b/build/whitespace_file\& .txt\fR
\fB index 3eba355\& .\& .57cdcee 100644\fR
@ -726,14 +715,14 @@ do so (now or later) by using \-b with the checkout command again\&. Example:
HEAD is now at beec6f4\& .\& .\& . Make ReflectorImpl use mailboxes
\fB $ git nav\- downstream\fR
Please select a downstream branch
0\& . chap2
1\& . fix_typo
Selection (0\- 1)[0]: 0
Previous HEAD position was beec6f4\& .\& .\& . Make ReflectorImpl use mailboxes
Switched to branch \* (Aqchap2\* (Aq
Your branch is ahead of \* (Aqorigin/master\* (Aq by 1 commit\& .
(use "git push" to publish your local commits)
Please select a downstream branch
0\& . chap2
1\& . fix_typo
Selection (0\- 1)[0]: 0
\fB $ git map\- branches\fR
origin/master
\fB chap2 *
dnj@chromium.org
10 years ago