| Index: docs/man1/git-nav-upstream.1
|
| diff --git a/docs/man1/git-nav-upstream.1 b/docs/man1/git-nav-upstream.1
|
| index de0c32eb786da6493366f8adccde2bf662bd7382..0e1ce57cb1af227148d55d1e2e1401f66fb2cc22 100644
|
| --- a/docs/man1/git-nav-upstream.1
|
| +++ b/docs/man1/git-nav-upstream.1
|
| @@ -2,12 +2,12 @@
|
| .\" Title: git-nav-upstream
|
| .\" 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\-UPSTREAM" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
|
| +.TH "GIT\-NAV\-UPSTREAM" "1" "04/10/2014" "depot_tools 1ce0237" "Chromium depot_tools Manual"
|
| .\" -----------------------------------------------------------------
|
| .\" * Define some portability stuff
|
| .\" -----------------------------------------------------------------
|
| @@ -40,6 +40,8 @@ git-nav-upstream \- Checkout the upstream branch of the currently checked out br
|
| \fIgit\-nav\-upstream\fR takes the current branch, finds it\*(Aqs upstream branch, and checks that out\&.
|
| .SH "EXAMPLE"
|
| .sp
|
| +
|
| +.sp
|
| .if n \{\
|
| .RS 4
|
| .\}
|
| @@ -47,25 +49,44 @@ git-nav-upstream \- Checkout the upstream branch of the currently checked out br
|
| \fB$ git map\-branches\fR
|
| origin/master
|
| cool_feature
|
| - \fBsubfeature *\:\fR
|
| - frozen_changes
|
| - master
|
| -{NO UPSTREAM}
|
| - bogus_noparent
|
| +\fB subfeature *
|
| +\fR fixit
|
| + frozen_branch
|
| \fB$ git nav\-upstream\fR
|
| +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
|
| +\fB cool_feature *
|
| +\fR subfeature
|
| + fixit
|
| + frozen_branch
|
| +\fB$ git nav\-upstream\fR
|
| +Note: checking out \*(Aqorigin/master\*(Aq\&.
|
| +
|
| +You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental \fB(1)\fR
|
| +changes and commit them, and you can discard any commits you make in this
|
| +state without impacting any branches by performing another checkout\&.
|
| +
|
| +If you want to create a new branch to retain commits you create, you may
|
| +do so (now or later) by using \-b with the checkout command again\&. Example:
|
| +
|
| + git checkout \-b new_branch_name
|
| +
|
| +HEAD is now at 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes
|
| +\fB$ git map\-branches\fR
|
| +\fBorigin/master *
|
| +\fR cool_feature
|
| subfeature
|
| - frozen_changes
|
| - master
|
| -{NO UPSTREAM}
|
| - bogus_noparent
|
| + fixit
|
| + frozen_branch
|
| .fi
|
| .if n \{\
|
| .RE
|
| .\}
|
| .sp
|
| +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\&.
|
| .SH "SUGGESTED ALIASES"
|
| .sp
|
| Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&.
|
| @@ -86,7 +107,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
|
| \fBgit-map-branches\fR(1), \fBgit-nav-downstream\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
|
|
|