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

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

Issue 200903002: Add documentation for git-map-branches, git-map, git-nav-downstream, (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@documentation
Patch Set: rebase Created 6 years, 9 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-thaw.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-thaw 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/13/2014 5 .\" Date: 03/14/2014
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools f48b2c2 7 .\" Source: depot_tools a57ed8f
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "GIT\-THAW" "1" "03/13/2014" "depot_tools f48b2c2" "Chromium depot_tools Man ual" 10 .TH "GIT\-NAV\-UPSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "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 .\" -----------------------------------------------------------------
21 .\" * set default formatting 21 .\" * set default formatting
22 .\" ----------------------------------------------------------------- 22 .\" -----------------------------------------------------------------
23 .\" disable hyphenation 23 .\" disable hyphenation
24 .nh 24 .nh
25 .\" disable justification (adjust text to left margin only) 25 .\" disable justification (adjust text to left margin only)
26 .ad l 26 .ad l
27 .\" ----------------------------------------------------------------- 27 .\" -----------------------------------------------------------------
28 .\" * MAIN CONTENT STARTS HERE * 28 .\" * MAIN CONTENT STARTS HERE *
29 .\" ----------------------------------------------------------------- 29 .\" -----------------------------------------------------------------
30 .SH "NAME" 30 .SH "NAME"
31 git-thaw \- Un\-freeze all changes on a frozen branch\&. 31 git-nav-upstream \- Checkout the upstream branch of the currently checked out br anch\&.
32 .SH "SYNOPSIS" 32 .SH "SYNOPSIS"
33 .sp 33 .sp
34 .nf 34 .nf
35 \fIgit thaw\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 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\&. 40 \fIgit\-nav\-upstream\fR takes the current branch, finds it\*(Aqs upstream branc h, and checks that out\&.
41 .SH "EXAMPLE"
41 .sp 42 .sp
42 If you freeze a branch multiple times (i\&.e\&. change files, freeze, change fil es, freeze), git thaw will thaw all of the freezes\&. 43 .if n \{\
44 .RS 4
45 .\}
46 .nf
47 \fB$ git map\-branches\fR
48 origin/master
49 cool_feature
50 \fBsubfeature *\:\fR
51 frozen_changes
52 master
53 {NO UPSTREAM}
54 bogus_noparent
55 \fB$ git nav\-upstream\fR
56 \fB$ git map\-branches\fR
57 origin/master
58 \fBcool_feature *\:\fR
59 subfeature
60 frozen_changes
61 master
62 {NO UPSTREAM}
63 bogus_noparent
64 .fi
65 .if n \{\
66 .RE
67 .\}
68 .sp
43 .SH "SEE ALSO" 69 .SH "SEE ALSO"
44 .sp 70 .sp
45 \fBgit-freeze\fR(1) 71 \fBgit-map-branches\fR(1), \fBgit-nav-downstream\fR(1)
46 .SH "CHROMIUM DEPOT_TOOLS" 72 .SH "CHROMIUM DEPOT_TOOLS"
47 .sp 73 .sp
48 Part of the chromium depot_tools suite\&. These tools are meant to assist with t he development of chromium and related projects\&. Download the tools from \m[bl ue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. 74 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\&.
49 .SH "NOTES" 75 .SH "NOTES"
50 .IP " 1." 4 76 .IP " 1." 4
51 here 77 here
52 .RS 4 78 .RS 4
53 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 79 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
54 .RE 80 .RE
OLDNEW
« no previous file with comments | « docs/man1/git-nav-downstream.1 ('k') | docs/man1/git-thaw.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698