Add a family of git-commands to assist with the management of multiple CLs/branches.

git-rebase-update - ensure all branches are up to date
git-new-branch - create branches
git-rename-branch - rename a branch while preserving parentage relationships
git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent.
git-squash-branch - collapse a branch into a single commit
git-upstream-diff - show the diff between the current branch and it's upstream branch
git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98

docs/html/depot_tools.html

@@ -799,6 +799,14 @@ Display history of all branches in a colorized terminal format.
 </dl></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
+<a href="git-mark-merge-base.html">git-mark-merge-base(1)</a>
+</dt>
+<dd>
+<p>
+Manually interact with depot_tools' merge-base markers.
+</p>
+</dd>
+<dt class="hdlist1">
 <a href="git-nav-downstream.html">git-nav-downstream(1)</a>
 </dt>
 <dd>
@@ -815,6 +823,46 @@ Checkout the upstream branch of the currently checked out branch.
 </p>
 </dd>
 <dt class="hdlist1">
+<a href="git-new-branch.html">git-new-branch(1)</a>
+</dt>
+<dd>
+<p>
+Create a new branch with correct tracking information.
+</p>
+</dd>
+<dt class="hdlist1">
+<a href="git-rebase-update.html">git-rebase-update(1)</a>
+</dt>
+<dd>
+<p>
+Updates all branches to have the latest changes from their upstreams.
+</p>
+</dd>
+<dt class="hdlist1">
+<a href="git-rename-branch.html">git-rename-branch(1)</a>
+</dt>
+<dd>
+<p>
+Rename a branch and correctly preserve all downstream relationships.
+</p>
+</dd>
+<dt class="hdlist1">
+<a href="git-reparent-branch.html">git-reparent-branch(1)</a>
+</dt>
+<dd>
+<p>
+Alter the parentage (upstream) for the current branch.
+</p>
+</dd>
+<dt class="hdlist1">
+<a href="git-squash-branch.html">git-squash-branch(1)</a>
+</dt>
+<dd>
+<p>
+Takes all commits in a single branch and replaces them with a single commit.
+</p>
+</dd>
+<dt class="hdlist1">
 <a href="git-thaw.html">git-thaw(1)</a>
 </dt>
 <dd>
@@ -822,6 +870,14 @@ Checkout the upstream branch of the currently checked out branch.
 Un-freeze all changes on a frozen branch.
 </p>
 </dd>
+<dt class="hdlist1">
+<a href="git-upstream-diff.html">git-upstream-diff(1)</a>
+</dt>
+<dd>
+<p>
+Print a diff of the current branch, compared to its upstream.
+</p>
+</dd>
 </dl></div>
 </div>
 </div>
@@ -829,7 +885,7 @@ Un-freeze all changes on a frozen branch.
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-14 13:12:40 PDT
+Last updated 2014-03-25 15:09:11 PDT
 </div>
 </div>
 </body>

docs/html/git-freeze.html

@@ -841,7 +841,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-14 14:01:10 PDT
+Last updated 2014-03-25 15:09:11 PDT
 </div>
 </div>
 </body>

docs/html/git-map-branches.html

@@ -773,7 +773,7 @@ Current branch is <span class="aqua">cyan</span>.
 <li>
 <p>
 The branch which will be modified with git-commit is denoted with an asterisk
-         (<code>*</code>) after the name.
+   (<code>*</code>) after the name.
 </p>
 </li>
 </ul></div>
@@ -796,8 +796,8 @@ Remote branches are <span class="red">red</span> (usually, the root of all other
 <li>
 <p>
 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=&lt;correct parent branch&gt;.
+   should be assigned a parent by checking out the branch and running git branch
+   --set-upstream-to=&lt;correct parent branch&gt;.
 </p>
 </li>
 </ul></div>
@@ -834,6 +834,18 @@ assuming that the <code>frozen_changes</code> branch was currently checked out,
 </div>
 </div>
 <div class="sect1">
+<h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
+file.</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>[alias]
+  git bmap = map-branches</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-map.html">git-map(1)</a></p></div>
@@ -851,7 +863,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-14 14:01:10 PDT
+Last updated 2014-03-25 15:09:11 PDT
 </div>
 </div>
 </body>

docs/html/git-map.html

@@ -787,6 +787,11 @@ Tags are <span class="fuchsia">magenta</span>.
 </li>
 <li>
 <p>
+Merge Base markers are <span class="black-background white">white</span>.
+</p>
+</li>
+<li>
+<p>
 The currently checked out commit is highlighted with a <span class="yellow blue-background">blue background</span>.
 </p>
 </li>
@@ -804,11 +809,11 @@ windows.</p></div>
 </dt>
 <dd>
 <p>
-        Extra parameters to pass to the internal <a href="git-log.html">git-log(1)</a> invocation. This
-        can be used to restrict what refs <em>git map</em> operates on, etc.
+  Extra parameters to pass to the internal <a href="git-log.html">git-log(1)</a> invocation. This
+  can be used to restrict what refs <em>git map</em> operates on, etc.
 </p>
 <div class="paragraph"><p>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
+the depot-tools.map-extra configuration variable to pre-set arguments (See
 <code>CONFIGURATION VARIABLES</code>)</p></div>
 </dd>
 </dl></div>
@@ -818,10 +823,10 @@ the depot_tools.map_extra configuration variable to pre-set arguments (See
 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_depot_tools_map_extra">depot_tools.map_extra</h3>
-<div class="paragraph"><p>Each value of the <em>depot_tools.map_extra</em> config variable is applied as an
+<h3 id="_depot_tools_map_extra">depot-tools.map-extra</h3>
+<div class="paragraph"><p>Each value of the <em>depot-tools.map-extra</em> config variable is applied as an
 additional argument to <code>git log</code> during the execution of git map. If you wish to
-configure this, use git <code>config --add depot_tools.map_extra &lt;value&gt;</code> to do so.</p></div>
+configure this, use git <code>config --add depot-tools.map-extra &lt;value&gt;</code> to do so.</p></div>
 </div>
 </div>
 </div>
@@ -835,18 +840,18 @@ configure this, use git <code>config --add depot_tools.map_extra &lt;value&gt;</
 <span class="white blue-background">*</span>&#8203;<strong><span class="blue-background red"> 7dcfe47       </span></strong> <span class="green">(</span>&#8203;<strong><span class="aqua">frozen_changes</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-12</span> ~ FREEZE.unindexed
 * <strong><span class="red">4b0c180</span></strong>        <span class="yellow">2014-03-12</span> ~ modfile
 * <strong><span class="red">59a7cca</span></strong>        <span class="yellow">2014-03-12</span> ~ a deleted file
-* <strong><span class="red">6bec695</span></strong>        <span class="green">(</span>&#8203;<span class="red">origin/master</span>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Add neat feature
+* <strong><span class="red">6bec695</span></strong>        <span class="green">(</span>&#8203;<span class="red">origin/master</span>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Add neat feature    <strong><span class="white">&lt;(frozen_changes)</span></strong>
 * <strong><span class="red">d15a38a</span></strong>        <span class="yellow">2014-03-11</span> ~ Epic README update
 * <strong><span class="red">d559894</span></strong>        <span class="green">(</span>&#8203;<strong><span class="lime">master</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Important upstream change
 <span class="red">|</span> * <strong><span class="red">9c311fd</span></strong>      <span class="green">(</span>&#8203;<strong><span class="lime">cool_feature</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Respond to CL comments
 <span class="red">|</span> <span class="green">|</span> * <strong><span class="red">2a1eeb2</span></strong>    <span class="green">(</span>&#8203;<strong><span class="lime">subfeature</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ integrate with CoolService
 <span class="red">|</span> <span class="green">|</span> * <strong><span class="red">d777af6</span></strong>    <span class="yellow">2014-03-11</span> ~ slick commenting action
 <span class="red">|</span> <span class="green">|/</span>
-<span class="red">|</span> * <strong><span class="red">265803a</span></strong>      <span class="yellow">2014-03-11</span> ~ another improvement
+<span class="red">|</span> * <strong><span class="red">265803a</span></strong>      <span class="yellow">2014-03-11</span> ~ another improvement    <strong><span class="white">&lt;(subfeature)</span></strong>
 <span class="red">|</span> * <strong><span class="red">6d831ac</span></strong>      <span class="green">(</span>&#8203;<strong><span class="fuchsia">spleen_tag</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Refactor spleen
 <span class="red">|</span> * <strong><span class="red">82e74ab</span></strong>      <span class="yellow">2014-03-11</span> ~ Add widget
 <span class="red">|/</span>
-* <strong><span class="red">d08c5b3</span></strong>        <span class="green">(</span>&#8203;<strong><span class="lime">bogus_noparent</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Wonderful beginnings</code></pre>
+* <strong><span class="red">d08c5b3</span></strong>        <span class="green">(</span>&#8203;<strong><span class="lime">bogus_noparent</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Wonderful beginnings    <strong><span class="white">&lt;(cool_feature)</span></strong></code></pre>
 </div></div>
 <div class="paragraph"><p>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 <em>upstream</em>
@@ -872,7 +877,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-14 14:01:55 PDT
+Last updated 2014-03-25 15:09:11 PDT
 </div>
 </div>
 </body>

docs/html/git-nav-downstream.html

@@ -801,6 +801,18 @@ Selection (0-2)[0]: 0
 </div>
 </div>
 <div class="sect1">
+<h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
+file.</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>[alias]
+  git down = nav-downstream</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-map-branches.html">git-map-branches(1)</a>, <a href="git-nav-upstream.html">git-nav-upstream(1)</a></p></div>
@@ -818,7 +830,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-14 14:24:49 PDT
+Last updated 2014-03-25 15:09:11 PDT
 </div>
 </div>
 </body>

docs/html/git-nav-upstream.html

@@ -793,6 +793,18 @@ checks that out.</p></div>
 </div>
 </div>
 <div class="sect1">
+<h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
+file.</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>[alias]
+  git up = nav-upstream</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-map-branches.html">git-map-branches(1)</a>, <a href="git-nav-downstream.html">git-nav-downstream(1)</a></p></div>
@@ -810,7 +822,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-14 14:26:05 PDT
+Last updated 2014-03-25 15:09:11 PDT
 </div>
 </div>
 </body>

docs/html/git-thaw.html

@@ -787,7 +787,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-14 13:12:40 PDT
+Last updated 2014-03-25 15:09:11 PDT
 </div>
 </div>
 </body>

docs/man1/depot_tools.1

@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 03/25/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 207bff1
 .\"  Language: English
 .\"
-.TH "DEPOT_TOOLS" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "DEPOT_TOOLS" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -55,6 +55,11 @@ Helper script to display all local git branches with \(oqupstream\(cq hierarchy
 Display history of all branches in a colorized terminal format\&.
 .RE
 .PP
+\fBgit-mark-merge-base\fR(1)
+.RS 4
+Manually interact with depot_tools\*(Aq merge\-base markers\&.
+.RE
+.PP
 \fBgit-nav-downstream\fR(1)
 .RS 4
 Checkout a downstream branch of the currently checked out branch\&.
@@ -65,10 +70,40 @@ Checkout a downstream branch of the currently checked out branch\&.
 Checkout the upstream branch of the currently checked out branch\&.
 .RE
 .PP
+\fBgit-new-branch\fR(1)
+.RS 4
+Create a new branch with correct tracking information\&.
+.RE
+.PP
+\fBgit-rebase-update\fR(1)
+.RS 4
+Updates all branches to have the latest changes from their upstreams\&.
+.RE
+.PP
+\fBgit-rename-branch\fR(1)
+.RS 4
+Rename a branch and correctly preserve all downstream relationships\&.
+.RE
+.PP
+\fBgit-reparent-branch\fR(1)
+.RS 4
+Alter the parentage (upstream) for the current branch\&.
+.RE
+.PP
+\fBgit-squash-branch\fR(1)
+.RS 4
+Takes all commits in a single branch and replaces them with a single commit\&.
+.RE
+.PP
 \fBgit-thaw\fR(1)
 .RS 4
 Un\-freeze all changes on a frozen branch\&.
 .RE
+.PP
+\fBgit-upstream-diff\fR(1)
+.RS 4
+Print a diff of the current branch, compared to its upstream\&.
+.RE
 .SH "NOTES"
 .IP " 1." 4
 here

docs/man1/git-freeze.1

@@ -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/14/2014
+.\"      Date: 03/25/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 207bff1
 .\"  Language: English
 .\"
-.TH "GIT\-FREEZE" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-FREEZE" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man1/git-map-branches.1

@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 03/25/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 207bff1
 .\"  Language: English
 .\"
-.TH "GIT\-MAP\-BRANCHES" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-MAP\-BRANCHES" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -148,6 +148,21 @@ origin/master
 .RE
 .\}
 .sp
+.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 bmap = map\-branches
+.fi
+.if n \{\
+.RE
+.\}
+.sp
 .SH "SEE ALSO"
 .sp
 \fBgit-map\fR(1)

docs/man1/git-map.1

@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 03/25/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 207bff1
 .\"  Language: English
 .\"
-.TH "GIT\-MAP" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-MAP" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -95,6 +95,18 @@ magenta\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+Merge Base markers are
+white\&.
+.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
@@ -110,13 +122,13 @@ 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
+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"
+.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\&.
+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:
@@ -129,18 +141,18 @@ Running \fIgit map\fR would result in an output something like:
 *\:\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
+* \fB6bec695\fR        (\:origin/master\:) 2014\-03\-11 ~ Add neat feature    \fB<(frozen_changes)\fR
 * \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
+| * \fB265803a\fR      2014\-03\-11 ~ another improvement    \fB<(subfeature)\fR
 | * \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
+* \fBd08c5b3\fR        (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful beginnings    \fB<(cool_feature)\fR
 .fi
 .if n \{\
 .RE

docs/man1/git-mark-merge-base.1

+'\" t
+.\"     Title: git-mark-merge-base
+.\"    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
+.\"    Manual: Chromium depot_tools Manual
+.\"    Source: depot_tools 207bff1
+.\"  Language: English
+.\"
+.TH "GIT\-MARK\-MERGE\-BA" "1" "03/25/2014" "depot_tools 207bff1" "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-mark-merge-base \- Manually interact with depot_tools\*(Aq merge\-base markers\&.
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit mark\-merge\-base\fR
+\fIgit mark\-merge\-base\fR <commit hash>
+\fIgit mark\-merge\-base\fR [\-d | \-\-delete]
+.fi
+.sp
+.SH "DESCRIPTION"
+.sp
+Inspect, set or delete the current merge\-base marker for the current branch\&. This should not be needed, but is useful if things get into a snarled state\&. Pass no arguments to view the current value\&. If you provide <commit hash>, then git mark\-merge\-base will attempt to set that as the merge\-base value\&.
+.sp
+It is invalid to pick a commit which is not an ancestor of the current branch\&.
+.sp
+See \fBgit-rebase-update\fR(1)\*(Aqs description of the branch\&.<name>\&.base configuration variable for more info on what the merge base markers are for\&.
+.SH "OPTIONS"
+.PP
+\-d, \-\-delete
+.RS 4
+Delete the merge\-base marker for the current branch\&.
+.RE
+.PP
+<commit hash>
+.RS 4
+The new value to set for the current branch\(cqs merge\-base marker\&.
+.RE
+.SH "SEE ALSO"
+.sp
+\fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\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

@@ -2,12 +2,12 @@
 .\"     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
+.\"      Date: 03/25/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 207bff1
 .\"  Language: English
 .\"
-.TH "GIT\-NAV\-DOWNSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-NAV\-DOWNSTREAM" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -72,6 +72,21 @@ origin/master
 .RE
 .\}
 .sp
+.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 down = nav\-downstream
+.fi
+.if n \{\
+.RE
+.\}
+.sp
 .SH "SEE ALSO"
 .sp
 \fBgit-map-branches\fR(1), \fBgit-nav-upstream\fR(1)

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/14/2014
+.\"      Date: 03/25/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 207bff1
 .\"  Language: English
 .\"
-.TH "GIT\-NAV\-UPSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-NAV\-UPSTREAM" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -66,6 +66,21 @@ origin/master
 .RE
 .\}
 .sp
+.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)

docs/man1/git-rename-branch.1

+'\" t
+.\"     Title: git-rename-branch
+.\"    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
+.\"    Manual: Chromium depot_tools Manual
+.\"    Source: depot_tools 207bff1
+.\"  Language: English
+.\"
+.TH "GIT\-RENAME\-BRANCH" "1" "03/25/2014" "depot_tools 207bff1" "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-rename-branch \- Rename a branch and correctly preserve all downstream relationships\&.
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit rename\-branch\fR <new_name>
+\fIgit rename\-branch\fR <old_name> <new_name>
+.fi
+.sp
+.SH "DESCRIPTION"
+.sp
+Rename the current (or specified) branch, then update all dowstream branches\*(Aq tracking information to preserve inter\-branch dependencies\&.
+.SH "SEE ALSO"
+.sp
+\fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-new-branch\fR(1), \fBgit-upstream-diff\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-thaw.1

@@ -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/14/2014
+.\"      Date: 03/25/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 207bff1
 .\"  Language: English
 .\"
-.TH "GIT\-THAW" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-THAW" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/src/_aliases.txt

+SUGGESTED ALIASES
+-----------------
+
+Some common short-hand aliases. Feel free to add these to your '~/.gitconfig'
+file.

docs/src/_footer.txt

@@ -5,4 +5,4 @@ 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:
+// vim: ft=asciidoc:

docs/src/_git-map-branches_desc.helper.txt

 Helper script to display all local git branches with ‘upstream’ hierarchy in
 colorized terminal format.
 
-// vim: ft=asciidoc noexpandtab:
+// vim: ft=asciidoc:

docs/src/_git-map_desc.helper.txt

 Display history of all branches in a colorized terminal format.
 
-// vim: ft=asciidoc noexpandtab:
+// vim: ft=asciidoc:

docs/src/_git-mark-merge-base_desc.helper.txt

+Manually interact with depot_tools' merge-base markers.