Skip to content

C
Chromium_Depot_tools
Commit a5d9502e authored by iannucci@chromium.org's avatar iannucci@chromium.org
Browse files
Options

Add documentation for git-map-branches, git-map, git-nav-downstream, 

git-nav-upstream, as well as introduce a generic 'depot_tools' manpage with a
listing of the other tools.

This change also fully colorizes the EXAMPLE sections for the git-* commands to
reflect their actual appearance on the console (html only, manpage has bolding
hints).

R=agable@chromium.org, szager@chromium.org
BUG=261738

Review URL: https://codereview.chromium.org/200903002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259338 0039d316-1c4b-4281-b951-d872f2087c98
parent b5cded69
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5411 additions and 51 deletions
docs/html/depot_tools.html 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/html/git-freeze.html 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/html/git-map-branches.html 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/html/git-map.html 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/html/git-nav-downstream.html 0 → 100644
View file @ a5d9502e
This diff is collapsed.
git_docs/htmlout/git-freeze.html → docs/html/git-nav-upstream.html
View file @ a5d9502e
......@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-freeze(1)</title>
<title>git-nav-upstream(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -535,6 +535,13 @@ body.manpage div.sectionbody {
}
div.listingblock > div.content {
background: rgb(28, 28, 28);
}
div.listingblock > div > pre > code {
color: rgb(187, 187, 187);
}
</style>
<script type="text/javascript">
/*<![CDATA[*/
......@@ -734,12 +741,12 @@ asciidoc.install();
<body class="manpage">
<div id="header">
<h1>
git-freeze(1) Manual Page
git-nav-upstream(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
<p>git-freeze -
Freeze all changes on a branch (indexed and unindexed)
<p>git-nav-upstream -
Checkout the upstream branch of the currently checked out branch.
</p>
</div>
</div>
......@@ -748,7 +755,7 @@ git-freeze(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git freeze</em></pre>
<pre class="content"><em>git nav-upstream</em></pre>
<div class="attribution">
</div></div>
</div>
......@@ -756,37 +763,54 @@ git-freeze(1) Manual Page
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p><code>git freeze</code> works a lot like <code>git stash</code>, in that it stores the current changes
in your working copy and index <em>somewhere</em>. Unlike <code>git stash</code>, <code>git freeze</code>
stores those changes on your current branch. This effectively allows you to
<em>pause</em> development of a branch, work on something else, and then come back to
exactly the same working state later (by running <code>git thaw</code>).</p></div>
<div class="paragraph"><p><code>git freeze</code> will make up to 2 commits on your branch. A commit with the message
<code>FREEZE.indexed</code> will contain all changes which you’ve added to your index (like
with <em>git add</em>, <em>git mv</em>, <em>git rm</em>, etc.). A commit with the message
<code>FREEZE.unindexed</code> will contain all changes which were not in your index at the
time you ran git freeze (freshly modified files, new files, etc.).</p></div>
<div class="paragraph"><p><em>git-nav-upstream</em> takes the current branch, finds it's upstream branch, and
checks that out.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
<div class="listingblock">
<div class="content">
<pre><code><strong><span class="white">$ git map-branches</span></strong>
<span class="red">origin/master</span>
<span class="green">cool_feature</span>
<strong><span class="aqua">subfeature *&#8203;</span></strong>
<span class="green">frozen_changes</span>
<span class="green">master</span>
<span class="fuchsia">{NO UPSTREAM}</span>
<span class="green">bogus_noparent</span>
<strong><span class="white">$ git nav-upstream</span></strong>
<strong><span class="white">$ git map-branches</span></strong>
<span class="red">origin/master</span>
<strong><span class="aqua">cool_feature *&#8203;</span></strong>
<span class="green">subfeature</span>
<span class="green">frozen_changes</span>
<span class="green">master</span>
<span class="fuchsia">{NO UPSTREAM}</span>
<span class="green">bogus_noparent</span></code></pre>
</div></div>
</div>
</div>
<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-thaw.html">git-thaw(1)</a></p></div>
<div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a>, <a href="git-nav-downstream.html">git-nav-downstream(1)</a></p></div>
</div>
</div>
<div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody">
<div class="paragraph"><p>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
<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2014-03-13 17:20:25 PDT
Last updated 2014-03-14 14:26:05 PDT
</div>
</div>
</body>
......
git_docs/htmlout/git-thaw.html → docs/html/git-thaw.html
View file @ a5d9502e
......@@ -535,6 +535,13 @@ body.manpage div.sectionbody {
}
div.listingblock > div.content {
background: rgb(28, 28, 28);
}
div.listingblock > div > pre > code {
color: rgb(187, 187, 187);
}
</style>
<script type="text/javascript">
/*<![CDATA[*/
......@@ -771,16 +778,16 @@ freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>
<div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody">
<div class="paragraph"><p>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
<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2014-03-13 17:20:25 PDT
Last updated 2014-03-14 13:12:40 PDT
</div>
</div>
</body>
......
docs/man1/depot_tools.1 0 → 100644
View file @ a5d9502e
'\" t
.\" Title: depot_tools
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/14/2014
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools a57ed8f
.\" Language: English
.\"
.TH "DEPOT_TOOLS" "1" "03/14/2014" "depot_tools a57ed8f" "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"
depot_tools \- A collection of tools for dealing with Chromium development\&.
.SH "DESCRIPTION"
.sp
The Chromium depot_tools suite contains many tools to assist/augment the Chromium development environment\&. The tools may be downloaded from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
.sp
There are two primary categories of tools\&. Some of these tools are \fIessential\fR to the development flow, in the sense that you cannot successfully develop Chromium without them\&.
.sp
Other tools are merely \fIhelper\fR tools\&. Not required, but they can substantially ease the develpment workflow\&.
.sp
A listing of both categories of tools follows\&.
.SH "HELPER TOOLS"
.PP
\fBgit-freeze\fR(1)
.RS 4
Freeze all changes on a branch (indexed and unindexed)\&.
.RE
.PP
\fBgit-map-branches\fR(1)
.RS 4
Helper script to display all local git branches with \(oqupstream\(cq hierarchy in colorized terminal format\&.
.RE
.PP
\fBgit-map\fR(1)
.RS 4
Display history of all branches in a colorized terminal format\&.
.RE
.PP
\fBgit-nav-downstream\fR(1)
.RS 4
Checkout a downstream branch of the currently checked out branch\&.
.RE
.PP
\fBgit-nav-upstream\fR(1)
.RS 4
Checkout the upstream branch of the currently checked out branch\&.
.RE
.PP
\fBgit-thaw\fR(1)
.RS 4
Un\-freeze all changes on a frozen branch\&.
.RE
.SH "NOTES"
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
man1/git-freeze.1 → docs/man1/git-freeze.1
View file @ a5d9502e
......@@ -2,12 +2,12 @@
.\" Title: git-freeze
.\" 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\-FREEZE" "1" "03/13/2014" "depot_tools f48b2c2" "Chromium depot_tools Manual"
.TH "GIT\-FREEZE" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
git-freeze \- Freeze all changes on a branch (indexed and unindexed)
git-freeze \- Freeze all changes on a branch (indexed and unindexed)\&.
.SH "SYNOPSIS"
.sp
.nf
......@@ -40,12 +40,63 @@ git-freeze \- Freeze all changes on a branch (indexed and unindexed)
git freeze works a lot like git stash, in that it stores the current changes in your working copy and index \fIsomewhere\fR\&. Unlike git stash, git freeze stores those changes on your current branch\&. This effectively allows you to \fIpause\fR development of a branch, work on something else, and then come back to exactly the same working state later (by running git thaw)\&.
.sp
git freeze will make up to 2 commits on your branch\&. A commit with the message FREEZE\&.indexed will contain all changes which you\(cqve added to your index (like with \fIgit add\fR, \fIgit mv\fR, \fIgit rm\fR, etc\&.)\&. A commit with the message FREEZE\&.unindexed will contain all changes which were not in your index at the time you ran git freeze (freshly modified files, new files, etc\&.)\&.
.SH "EXAMPLE"
.sp
.if n \{\
.RS 4
.\}
.nf
\fB$ git status \-\-short\fR
A added_file
A\:M added_file_with_unstaged_changes
D deleted_file
M modified_file
D unstaged_deleted_file
?? unadded_file
\fB$ git freeze\fR
\fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR
commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd
Author: Robert Iannucci <iannucci@chromium\&.org>
Date: Thu Mar 13 17:42:37 2014 \-0700
FREEZE\&.unindexed
added_file_with_unstaged_changes | 3 ++\:\-
modified_file | 4 +++\:\-
unadded_file | 3 +++
unstaged_deleted_file | 1 \-
4 files changed, 8 insertions(+), 3 deletions(\-)
commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4
Author: Robert Iannucci <iannucci@chromium\&.org>
Date: Thu Mar 13 17:42:37 2014 \-0700
FREEZE\&.indexed
added_file | 3 +++
added_file_with_unstaged_changes | 1 +
deleted_file | 1 \-
3 files changed, 4 insertions(+), 1 deletion(\-)
\fB$ git thaw\fR
\fB$ git status \-\-short\fR
A added_file
A\:M added_file_with_unstaged_changes
D deleted_file
M modified_file
D unstaged_deleted_file
?? unadded_file
.fi
.if n \{\
.RE
.\}
.sp
.SH "SEE ALSO"
.sp
\fBgit-thaw\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
......
docs/man1/git-map-branches.1 0 → 100644
View file @ a5d9502e
'\" t
.\" Title: git-map-branches
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/14/2014
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools a57ed8f
.\" Language: English
.\"
.TH "GIT\-MAP\-BRANCHES" "1" "03/14/2014" "depot_tools a57ed8f" "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-map-branches \- Helper script to display all local git branches with \(oqupstream\(cq hierarchy in colorized terminal format\&.
.SH "SYNOPSIS"
.sp
.nf
\fIgit map\-branches\fR
.fi
.sp
.SH "DESCRIPTION"
.sp
Git map\-branches displays all local branches such that:
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Current branch is
cyan\&.
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
The branch which will be modified with git\-commit is denoted with an asterisk (*) after the name\&.
.RE
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Local branches are
green\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Remote branches are
red
(usually, the root of all other branches)\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
{NO UPSTREAM}
is a special placeholder in
magenta\&.
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Branches which have this as their parent are usually misconfigured, and should be assigned a parent by checking out the branch and running git branch \-\-set\-upstream\-to=<correct parent branch>\&.
.RE
.RE
.if n \{\
.sp
.\}
.RS 4
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
.ps +1
\fBNote\fR
.ps -1
.br
.sp
If multiple branches are on the same commit, they will all be cyan\&.
.sp .5v
.RE
.SH "EXAMPLE"
.sp
Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and assuming that the frozen_changes branch was currently checked out, running \fIgit map\-branches\fR would result in an output like:
.sp
.if n \{\
.RS 4
.\}
.nf
\fB$ git map\-branches\fR
origin/master
cool_feature
subfeature
frozen_changes *
master
{NO UPSTREAM}
bogus_noparent
duplicate_cool_feature_no_upstream
.fi
.if n \{\
.RE
.\}
.sp
.SH "SEE ALSO"
.sp
\fBgit-map\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\&.
.SH "NOTES"
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
docs/man1/git-map.1 0 → 100644
View file @ a5d9502e
'\" t
.\" Title: git-map
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/14/2014
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools a57ed8f
.\" Language: English
.\"
.TH "GIT\-MAP" "1" "03/14/2014" "depot_tools a57ed8f" "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-map \- Display history of all branches in a colorized terminal format\&.
.SH "SYNOPSIS"
.sp
.nf
\fIgit map\fR [<extra_args>\&...]
.fi
.sp
.SH "DESCRIPTION"
.sp
Git map formats the output of git log \-\-graph from all refs such that:
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Current branch is
cyan\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Local branches are
green\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Remote branches are
red\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Tags are
magenta\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
The currently checked out commit is highlighted with a
blue background\&.
.RE
.sp
The output is automatically piped through the less pager command, even on windows\&.
.SH "OPTIONS"
.PP
<extra_args>\&...
.RS 4
Extra parameters to pass to the internal
\fBgit-log\fR(1)
invocation\&. This can be used to restrict what refs
\fIgit map\fR
operates on, etc\&.
.sp
If you run git map with a series of fixed arguments frequently, you can use the depot_tools\&.map_extra configuration variable to pre\-set arguments (See
CONFIGURATION VARIABLES)
.RE
.SH "CONFIGURATION VARIABLES"
.SS "depot_tools\&.map_extra"
.sp
Each value of the \fIdepot_tools\&.map_extra\fR config variable is applied as an additional argument to git log during the execution of git map\&. If you wish to configure this, use git config \-\-add depot_tools\&.map_extra <value> to do so\&.
.SH "EXAMPLE"
.sp
Running \fIgit map\fR would result in an output something like:
.sp
.if n \{\
.RS 4
.\}
.nf
\fB$ git map\fR
*\:\fB 7dcfe47 \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-12 ~ FREEZE\&.unindexed
* \fB4b0c180\fR 2014\-03\-12 ~ modfile
* \fB59a7cca\fR 2014\-03\-12 ~ a deleted file
* \fB6bec695\fR (\:origin/master\:) 2014\-03\-11 ~ Add neat feature
* \fBd15a38a\fR 2014\-03\-11 ~ Epic README update
* \fBd559894\fR (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream change
| * \fB9c311fd\fR (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL comments
| | * \fB2a1eeb2\fR (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with CoolService
| | * \fBd777af6\fR 2014\-03\-11 ~ slick commenting action
| |/
| * \fB265803a\fR 2014\-03\-11 ~ another improvement
| * \fB6d831ac\fR (\:\fBspleen_tag\fR\:) 2014\-03\-11 ~ Refactor spleen
| * \fB82e74ab\fR 2014\-03\-11 ~ Add widget
|/
* \fBd08c5b3\fR (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful beginnings
.fi
.if n \{\
.RE
.\}
.sp
.sp
As you can see, the structure of the commit history is visible, particularly what the parents of each commit are\&. In order to see the \fIupstream\fR relationships of the branches (i\&.e\&. which branch is tracking which other branch), use the \fBgit-map-branches\fR(1) command\&.
.SH "SEE ALSO"
.sp
\fBgit-map-branches\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\&.
.SH "NOTES"
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
docs/man1/git-nav-downstream.1 0 → 100644
View file @ a5d9502e
'\" t
.\" 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/14/2014
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools a57ed8f
.\" Language: English
.\"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "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-downstream \- Checkout a downstream branch of the currently checked out branch\&.
.SH "SYNOPSIS"
.sp
.nf
\fIgit nav\-downstream\fR
.fi
.sp
.SH "DESCRIPTION"
.sp
\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
.if n \{\
.RS 4
.\}
.nf
\fB$ git map\-branches\fR
\fBorigin/master *\:\fR
cool_feature
subfeature
frozen_changes
master
{NO UPSTREAM}
bogus_noparent
\fB$ git nav\-downstream\fR
Please select a downstream branch
0\&. cool_feature
1\&. frozen_changes
2\&. master
Selection (0\-2)[0]: 0
\fB$ git map\-branches\fR
origin/master
\fBcool_feature *\:\fR
subfeature
frozen_changes
master
{NO UPSTREAM}
bogus_noparent
.fi
.if n \{\
.RE
.\}
.sp
.SH "SEE ALSO"
.sp
\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\&.
.SH "NOTES"
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
docs/man1/git-nav-upstream.1 0 → 100644
View file @ a5d9502e
This diff is collapsed.
man1/git-thaw.1 → docs/man1/git-thaw.1
View file @ a5d9502e
......@@ -2,12 +2,12 @@
.\" Title: git-thaw
.\" 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\-THAW" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -45,7 +45,7 @@ If you freeze a branch multiple times (i\&.e\&. change files, freeze, change fil
\fBgit-freeze\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
......
docs/src/.gitignore 0 → 100644
View file @ a5d9502e
git
__*.txt
\ No newline at end of file
docs/src/_footer.txt 0 → 100644
View file @ a5d9502e
CHROMIUM DEPOT_TOOLS
--------------------
Part of the chromium linkgit:depot_tools[1] suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools
from link:{sys3:git config remote.origin.url}[here].
// vim: ft=asciidoc noexpandtab:
docs/src/_git-freeze_desc.helper.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/_git-map-branches_desc.helper.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/_git-map_desc.helper.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/_git-nav-downstream_desc.helper.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/_git-nav-upstream_desc.helper.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/_git-thaw_desc.helper.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/asciidoc-override.css 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/depot_tools.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/git-map-branches.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/git-map.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/git-nav-downstream.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
docs/src/git-nav-upstream.txt 0 → 100644
View file @ a5d9502e
This diff is collapsed.
git_docs/.gitignore deleted 100644 → 0
View file @ b5cded69
This diff is collapsed.
git_docs/_footer.txt deleted 100644 → 0
View file @ b5cded69
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment