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

Side by Side Diff: docs/man1/git-nav-upstream.1

Issue 225433003: Add a basic tutorial for the tools in depot_tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@git_map
Patch Set: pylint Created 6 years, 8 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
« no previous file with comments | « docs/man1/git-nav-downstream.1 ('k') | docs/man1/git-new-branch.1 » ('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-nav-upstream 2 .\" Title: git-nav-upstream
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.78.1 <http://docbook.sf.net/> 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5 .\" Date: 03/25/2014 5 .\" Date: 04/10/2014
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools 207bff1 7 .\" Source: depot_tools 1ce0237
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "GIT\-NAV\-UPSTREAM" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_ tools Manual" 10 .TH "GIT\-NAV\-UPSTREAM" "1" "04/10/2014" "depot_tools 1ce0237" "Chromium depot_ 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 12 matching lines...) Expand all
33 .sp 33 .sp
34 .nf 34 .nf
35 \fIgit nav\-upstream\fR 35 \fIgit nav\-upstream\fR
36 .fi 36 .fi
37 .sp 37 .sp
38 .SH "DESCRIPTION" 38 .SH "DESCRIPTION"
39 .sp 39 .sp
40 \fIgit\-nav\-upstream\fR takes the current branch, finds it\*(Aqs upstream branc h, and checks that out\&. 40 \fIgit\-nav\-upstream\fR takes the current branch, finds it\*(Aqs upstream branc h, and checks that out\&.
41 .SH "EXAMPLE" 41 .SH "EXAMPLE"
42 .sp 42 .sp
43
44 .sp
43 .if n \{\ 45 .if n \{\
44 .RS 4 46 .RS 4
45 .\} 47 .\}
46 .nf 48 .nf
47 \fB$ git map\-branches\fR 49 \fB$ git map\-branches\fR
48 origin/master 50 origin/master
49 cool_feature 51 cool_feature
50 \fBsubfeature *\:\fR 52 \fB subfeature *
51 frozen_changes 53 \fR fixit
52 master 54 frozen_branch
53 {NO UPSTREAM}
54 bogus_noparent
55 \fB$ git nav\-upstream\fR 55 \fB$ git nav\-upstream\fR
56 Switched to branch \*(Aqcool_feature\*(Aq
57 Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
58 (use "git push" to publish your local commits)
56 \fB$ git map\-branches\fR 59 \fB$ git map\-branches\fR
57 origin/master 60 origin/master
58 \fBcool_feature *\:\fR 61 \fB cool_feature *
62 \fR subfeature
63 fixit
64 frozen_branch
65 \fB$ git nav\-upstream\fR
66 Note: checking out \*(Aqorigin/master\*(Aq\&.
67
68 You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experiment al \fB(1)\fR
69 changes and commit them, and you can discard any commits you make in this
70 state without impacting any branches by performing another checkout\&.
71
72 If you want to create a new branch to retain commits you create, you may
73 do so (now or later) by using \-b with the checkout command again\&. Example:
74
75 git checkout \-b new_branch_name
76
77 HEAD is now at 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes
78 \fB$ git map\-branches\fR
79 \fBorigin/master *
80 \fR cool_feature
59 subfeature 81 subfeature
60 frozen_changes 82 fixit
61 master 83 frozen_branch
62 {NO UPSTREAM}
63 bogus_noparent
64 .fi 84 .fi
65 .if n \{\ 85 .if n \{\
66 .RE 86 .RE
67 .\} 87 .\}
68 .sp 88 .sp
89 1\&. Note that being in a \fIdetached HEAD\fR state is OK\&. You\(cqll just want to create a \fBgit-new-branch\fR(1) from here\&.
69 .SH "SUGGESTED ALIASES" 90 .SH "SUGGESTED ALIASES"
70 .sp 91 .sp
71 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon fig\fR file\&. 92 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon fig\fR file\&.
72 .sp 93 .sp
73 .if n \{\ 94 .if n \{\
74 .RS 4 95 .RS 4
75 .\} 96 .\}
76 .nf 97 .nf
77 [alias] 98 [alias]
78 git up = nav\-upstream 99 git up = nav\-upstream
79 .fi 100 .fi
80 .if n \{\ 101 .if n \{\
81 .RE 102 .RE
82 .\} 103 .\}
83 .sp 104 .sp
84 .SH "SEE ALSO" 105 .SH "SEE ALSO"
85 .sp 106 .sp
86 \fBgit-map-branches\fR(1), \fBgit-nav-downstream\fR(1) 107 \fBgit-map-branches\fR(1), \fBgit-nav-downstream\fR(1)
87 .SH "CHROMIUM DEPOT_TOOLS" 108 .SH "CHROMIUM DEPOT_TOOLS"
88 .sp 109 .sp
89 Part of the chromium \fBdepot_tools\fR(1) 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\&. 110 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" 111 .SH "NOTES"
91 .IP " 1." 4 112 .IP " 1." 4
92 here 113 here
93 .RS 4 114 .RS 4
94 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 115 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
95 .RE 116 .RE
OLDNEW
« no previous file with comments | « docs/man1/git-nav-downstream.1 ('k') | docs/man1/git-new-branch.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698