You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
117 lines
3.4 KiB
Groff
117 lines
3.4 KiB
Groff
'\" t
|
|
.\" 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: 12/15/2016
|
|
.\" Manual: Chromium depot_tools Manual
|
|
.\" Source: depot_tools f72f1ad
|
|
.\" Language: English
|
|
.\"
|
|
.TH "GIT\-NAV\-UPSTREAM" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
|
|
.\" -----------------------------------------------------------------
|
|
.\" * Define some portability stuff
|
|
.\" -----------------------------------------------------------------
|
|
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
.\" http://bugs.debian.org/507673
|
|
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
|
|
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
.ie \n(.g .ds Aq \(aq
|
|
.el .ds Aq '
|
|
.\" -----------------------------------------------------------------
|
|
.\" * set default formatting
|
|
.\" -----------------------------------------------------------------
|
|
.\" disable hyphenation
|
|
.nh
|
|
.\" disable justification (adjust text to left margin only)
|
|
.ad l
|
|
.\" -----------------------------------------------------------------
|
|
.\" * MAIN CONTENT STARTS HERE *
|
|
.\" -----------------------------------------------------------------
|
|
.SH "NAME"
|
|
git-nav-upstream \- Checkout the upstream branch of the currently checked out branch\&.
|
|
.SH "SYNOPSIS"
|
|
.sp
|
|
.nf
|
|
\fIgit nav\-upstream\fR
|
|
.fi
|
|
.sp
|
|
.SH "DESCRIPTION"
|
|
.sp
|
|
\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
|
|
.\}
|
|
.nf
|
|
\fB$ git map\-branches\fR
|
|
origin/master
|
|
cool_feature
|
|
\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
|
|
\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 beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
|
|
\fB$ git map\-branches\fR
|
|
\fBorigin/master
|
|
\fR cool_feature
|
|
subfeature
|
|
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\&.
|
|
.sp
|
|
.if n \{\
|
|
.RS 4
|
|
.\}
|
|
.nf
|
|
[alias]
|
|
git up = nav\-upstream
|
|
.fi
|
|
.if n \{\
|
|
.RE
|
|
.\}
|
|
.sp
|
|
.SH "SEE ALSO"
|
|
.sp
|
|
\fBgit-map-branches\fR(1), \fBgit-nav-downstream\fR(1)
|
|
.SH "CHROMIUM DEPOT_TOOLS"
|
|
.sp
|
|
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
|
|
.RS 4
|
|
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
|
.RE
|