| Index: docs/man1/git-nav-upstream.1
|
| diff --git a/man1/git-thaw.1 b/docs/man1/git-nav-upstream.1
|
| similarity index 56%
|
| copy from man1/git-thaw.1
|
| copy to docs/man1/git-nav-upstream.1
|
| index c9f3cc27fcbc69d4b2cf99de9ac496f605a5819d..6588467d7074c6ef0251d93bacf9a38a747311b6 100644
|
| --- a/man1/git-thaw.1
|
| +++ b/docs/man1/git-nav-upstream.1
|
| @@ -1,13 +1,13 @@
|
| '\" t
|
| -.\" Title: git-thaw
|
| +.\" 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/13/2014
|
| +.\" Date: 03/14/2014
|
| .\" Manual: Chromium depot_tools Manual
|
| -.\" Source: depot_tools f48b2c2
|
| +.\" Source: depot_tools a57ed8f
|
| .\" Language: English
|
| .\"
|
| -.TH "GIT\-THAW" "1" "03/13/2014" "depot_tools f48b2c2" "Chromium depot_tools Manual"
|
| +.TH "GIT\-NAV\-UPSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
|
| .\" -----------------------------------------------------------------
|
| .\" * Define some portability stuff
|
| .\" -----------------------------------------------------------------
|
| @@ -28,24 +28,50 @@
|
| .\" * MAIN CONTENT STARTS HERE *
|
| .\" -----------------------------------------------------------------
|
| .SH "NAME"
|
| -git-thaw \- Un\-freeze all changes on a frozen branch\&.
|
| +git-nav-upstream \- Checkout the upstream branch of the currently checked out branch\&.
|
| .SH "SYNOPSIS"
|
| .sp
|
| .nf
|
| -\fIgit thaw\fR
|
| +\fIgit nav\-upstream\fR
|
| .fi
|
| .sp
|
| .SH "DESCRIPTION"
|
| .sp
|
| -git thaw takes a frozen branch (as made by \fBgit-freeze\fR(1)), and returns it to the status that it was in before it was frozen\&.
|
| +\fIgit\-nav\-upstream\fR takes the current branch, finds it\*(Aqs upstream branch, and checks that out\&.
|
| +.SH "EXAMPLE"
|
| +.sp
|
| +.if n \{\
|
| +.RS 4
|
| +.\}
|
| +.nf
|
| +\fB$ git map\-branches\fR
|
| +origin/master
|
| + cool_feature
|
| + \fBsubfeature *\:\fR
|
| + frozen_changes
|
| + master
|
| +{NO UPSTREAM}
|
| + bogus_noparent
|
| +\fB$ git nav\-upstream\fR
|
| +\fB$ git map\-branches\fR
|
| +origin/master
|
| + \fBcool_feature *\:\fR
|
| + subfeature
|
| + frozen_changes
|
| + master
|
| +{NO UPSTREAM}
|
| + bogus_noparent
|
| +.fi
|
| +.if n \{\
|
| +.RE
|
| +.\}
|
| .sp
|
| -If you freeze a branch multiple times (i\&.e\&. change files, freeze, change files, freeze), git thaw will thaw all of the freezes\&.
|
| .SH "SEE ALSO"
|
| .sp
|
| -\fBgit-freeze\fR(1)
|
| +\fBgit-map-branches\fR(1), \fBgit-nav-downstream\fR(1)
|
| .SH "CHROMIUM DEPOT_TOOLS"
|
| .sp
|
| -Part of the chromium depot_tools 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(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\&.
|
| .SH "NOTES"
|
| .IP " 1." 4
|
| here
|
|
|