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

Unified Diff: docs/man1/git-nav-downstream.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « docs/man1/git-mark-merge-base.1 ('k') | docs/man1/git-nav-upstream.1 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/man1/git-nav-downstream.1
diff --git a/docs/man1/git-nav-downstream.1 b/docs/man1/git-nav-downstream.1
index 345352523f55350dc04811b2ee59e9529a214886..ed9195503bdf77d0c276dffd01235d24d574d66e 100644
--- a/docs/man1/git-nav-downstream.1
+++ b/docs/man1/git-nav-downstream.1
@@ -2,12 +2,12 @@
.\" Title: git-nav-downstream
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 03/25/2014
+.\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual
-.\" Source: depot_tools 207bff1
+.\" Source: depot_tools 1ce0237
.\" Language: English
.\"
-.TH "GIT\-NAV\-DOWNSTREAM" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
+.TH "GIT\-NAV\-DOWNSTREAM" "1" "04/10/2014" "depot_tools 1ce0237" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -40,33 +40,44 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out
\fIgit\-nav\-downstream\fR takes the current branch and discovers all branches downstream of it\&. If there is only one branch downstream of the current branch, the command will check that out\&. If there\*(Aqs more than one downstream branch, the command will prompt you with a selection of the branches\&.
.SH "EXAMPLE"
.sp
+
+.sp
.if n \{\
.RS 4
.\}
.nf
\fB$ git map\-branches\fR
-\fBorigin/master *\:\fR
- cool_feature
+\fBorigin/master *
+\fR cool_feature
subfeature
- frozen_changes
- master
-{NO UPSTREAM}
- bogus_noparent
+ fixit
+ frozen_branch
\fB$ git nav\-downstream\fR
-
Please select a downstream branch
0\&. cool_feature
- 1\&. frozen_changes
- 2\&. master
-Selection (0\-2)[0]: 0
+ 1\&. fixit
+Selection (0\-1)[0]: 0
+Previous HEAD position was 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes
+Switched to branch \*(Aqcool_feature\*(Aq
+Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
+ (use "git push" to publish your local commits)
\fB$ git map\-branches\fR
origin/master
- \fBcool_feature *\:\fR
- subfeature
- frozen_changes
- master
-{NO UPSTREAM}
- bogus_noparent
+\fB cool_feature *
+\fR subfeature
+ fixit
+ frozen_branch
+\fB$ git nav\-downstream\fR
+Switched to branch \*(Aqsubfeature\*(Aq
+Your branch and \*(Aqcool_feature\*(Aq have diverged,
+and have 2 and 1 different commit each, respectively\&.
+ (use "git pull" to merge the remote branch into yours)
+\fB$ git map\-branches\fR
+origin/master
+ cool_feature
+\fB subfeature *
+\fR fixit
+ frozen_branch
.fi
.if n \{\
.RE
@@ -92,7 +103,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-map-branches\fR(1), \fBgit-nav-upstream\fR(1)
.SH "CHROMIUM DEPOT_TOOLS"
.sp
-Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
.SH "NOTES"
.IP " 1." 4
here
« no previous file with comments | « docs/man1/git-mark-merge-base.1 ('k') | docs/man1/git-nav-upstream.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698