Skip to content

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

Add a tutorial / walkthrough for pure-git workflow. 

TBR=agable@chromium.org, szager@chromium.org
BUG=261743

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
parent 2d8c977b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4167 additions and 584 deletions
docs/html/depot_tools.html
View file @ 21980029
...@@ -768,6 +768,7 @@ ease the develpment workflow.</p></div> ...@@ -768,6 +768,7 @@ ease the develpment workflow.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_helper_tools">HELPER TOOLS</h2> <h2 id="_helper_tools">HELPER TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>A tutorial for these tools can be found at <a href="depot_tools_tutorial.html">depot_tools_tutorial(7)</a>.</p></div>
<div class="dlist"><dl> <div class="dlist"><dl>
<dt class="hdlist1"> <dt class="hdlist1">
<a href="git-freeze.html">git-freeze(1)</a> <a href="git-freeze.html">git-freeze(1)</a>
...@@ -885,7 +886,7 @@ Print a diff of the current branch, compared to its upstream. ...@@ -885,7 +886,7 @@ Print a diff of the current branch, compared to its upstream.
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-26 03:27:50 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/depot_tools_tutorial.html 0 → 100644
View file @ 21980029
This diff is collapsed.
docs/html/git-freeze.html
View file @ 21980029
...@@ -778,49 +778,47 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div> ...@@ -778,49 +778,47 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_example">EXAMPLE</h2> <h2 id="_example">EXAMPLE</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="listingblock"> <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git status --short</span>
<div class="content"> <span style="color: #19c518">A</span> added_file
<pre><code><strong><span class="white">$ git status --short</span></strong> <span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added_file_with_unstaged_changes
<span class="green">A</span> added_file <span style="color: #19c518">D</span> deleted_file
<span class="green">A</span>&#8203;<span class="red">M</span> added_file_with_unstaged_changes <span style="color: #e42e16">M</span> modified_file
<span class="green">D</span> deleted_file <span style="color: #e42e16">D</span> unstaged_deleted_file
<span class="red">M</span> modified_file <span style="color: #e42e16">??</span> unadded_file
<span class="red">D</span> unstaged_deleted_file <span style="font-weight: bold; color: #ffffff">$ git freeze</span>
<span class="red">??</span> unadded_file <span style="font-weight: bold; color: #ffffff">$ git status --short</span>
<strong><span class="white">$ git freeze</span></strong> <span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
<strong><span class="white">$ git status --short</span></strong> <span style="color: #e7e71c">commit 2903a59a5323dd12438a9b3912a878a546b5d68a</span>
<strong><span class="white">$ git log -n 2 --stat</span></strong> Author: local &lt;local@chromium.org&gt;
<span class="yellow">commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd</span> Date: Thu Apr 10 08:54:56 2014 +0000
Author: Robert Iannucci &lt;iannucci@chromium.org&gt;
Date: Thu Mar 13 17:42:37 2014 -0700
FREEZE.unindexed FREEZE.unindexed
added_file_with_unstaged_changes | 3 <span class="green">++</span>&#8203;<span class="red">-</span> added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span>
modified_file | 4 <span class="green">+++</span>&#8203;<span class="red">-</span> modified_file | 1 <span style="color: #19c518">+</span>
unadded_file | 3 <span class="green">+++</span> unadded_file | 0
unstaged_deleted_file | 1 <span class="red">-</span> unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
4 files changed, 8 insertions(+), 3 deletions(-) 4 files changed, 2 insertions(+), 1 deletion(-)
<span class="yellow">commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4</span> <span style="color: #e7e71c">commit 19e09ed3f4a23417cf46ce0961fc7434132d0295</span>
Author: Robert Iannucci &lt;iannucci@chromium.org&gt; Author: local &lt;local@chromium.org&gt;
Date: Thu Mar 13 17:42:37 2014 -0700 Date: Thu Apr 10 08:54:56 2014 +0000
FREEZE.indexed FREEZE.indexed
added_file | 3 <span class="green">+++</span> added_file | 1 <span style="color: #19c518">+</span>
added_file_with_unstaged_changes | 1 <span class="green">+</span> added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span>
deleted_file | 1 <span class="red">-</span> deleted_file | 1 <span style="color: #e42e16">-</span>
3 files changed, 4 insertions(+), 1 deletion(-) 3 files changed, 2 insertions(+), 1 deletion(-)
<strong><span class="white">$ git thaw</span></strong> <span style="font-weight: bold; color: #ffffff">$ git thaw</span>
<strong><span class="white">$ git status --short</span></strong> <span style="font-weight: bold; color: #ffffff">$ git status --short</span>
<span class="green">A</span> added_file <span style="color: #19c518">A</span> added_file
<span class="green">A</span>&#8203;<span class="red">M</span> added_file_with_unstaged_changes <span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added_file_with_unstaged_changes
<span class="green">D</span> deleted_file <span style="color: #19c518">D</span> deleted_file
<span class="red">M</span> modified_file <span style="color: #e42e16">M</span> modified_file
<span class="red">D</span> unstaged_deleted_file <span style="color: #e42e16">D</span> unstaged_deleted_file
<span class="red">??</span> unadded_file</code></pre> <span style="color: #e42e16">??</span> unadded_file
</div></div> </code></pre></div></div><p><div class="paragraph"></p></div>
</div> </div>
</div> </div>
<div class="sect1"> <div class="sect1">
...@@ -832,7 +830,7 @@ Date: Thu Mar 13 17:42:37 2014 -0700 ...@@ -832,7 +830,7 @@ Date: Thu Mar 13 17:42:37 2014 -0700
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -841,7 +839,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -841,7 +839,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-map-branches.html
View file @ 21980029
...@@ -819,18 +819,15 @@ Branches which have this as their parent are usually misconfigured, and ...@@ -819,18 +819,15 @@ Branches which have this as their parent are usually misconfigured, and
<div class="paragraph"><p>Given the hypothetical demo repo in <a href="git-map.html">git-map(1)</a>'s EXAMPLE section, and <div class="paragraph"><p>Given the hypothetical demo repo in <a href="git-map.html">git-map(1)</a>'s EXAMPLE section, and
assuming that the <code>frozen_changes</code> branch was currently checked out, running assuming that the <code>frozen_changes</code> branch was currently checked out, running
<em>git map-branches</em> would result in an output like:</p></div> <em>git map-branches</em> would result in an output like:</p></div>
<div class="listingblock"> <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<div class="content"> <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
<pre><code><strong><span class="white">$ git map-branches</span></strong> </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
<span class="red">origin/master</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
<span class="green">cool_feature</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
<span class="green">subfeature</span> </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch *
<span class="aqua">frozen_changes *</span> </span><span style="font-weight: bold; color: #d338d3"></span><span style="color: #d338d3">{NO UPSTREAM}
<span class="green">master</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> no_upstream</span>
<span class="fuchsia">{NO UPSTREAM}</span> </code></pre></div></div><p><div class="paragraph"></p></div>
<span class="green">bogus_noparent</span>
<span class="aqua">duplicate_cool_feature_no_upstream</span></code></pre>
</div></div>
</div> </div>
</div> </div>
<div class="sect1"> <div class="sect1">
...@@ -854,7 +851,7 @@ file.</p></div> ...@@ -854,7 +851,7 @@ file.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -863,7 +860,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -863,7 +860,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-map.html
View file @ 21980029
This diff is collapsed.
docs/html/git-mark-merge-base.html
View file @ 21980029
...@@ -810,7 +810,7 @@ configuration variable for more info on what the merge base markers are for.</p> ...@@ -810,7 +810,7 @@ configuration variable for more info on what the merge base markers are for.</p>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -819,7 +819,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -819,7 +819,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-nav-downstream.html
View file @ 21980029
...@@ -772,32 +772,39 @@ command will prompt you with a selection of the branches.</p></div> ...@@ -772,32 +772,39 @@ command will prompt you with a selection of the branches.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_example">EXAMPLE</h2> <h2 id="_example">EXAMPLE</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="listingblock"> <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<div class="content"> <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master *
<pre><code><strong><span class="white">$ git map-branches</span></strong> </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature
<strong><span class="red">origin/master *&#8203;</span></strong> </span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
<span class="green">cool_feature</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
<span class="green">subfeature</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
<span class="green">frozen_changes</span> </span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
<span class="green">master</span>
<span class="fuchsia">{NO UPSTREAM}</span>
<span class="green">bogus_noparent</span>
<strong><span class="white">$ git nav-downstream</span></strong>
Please select a downstream branch Please select a downstream branch
0. cool_feature 0. cool_feature
1. frozen_changes 1. fixit
2. master Selection (0-1)[0]: 0
Selection (0-2)[0]: 0 Previous HEAD position was 619ccc9... Make ReflectorImpl use mailboxes
<strong><span class="white">$ git map-branches</span></strong> Switched to branch 'cool_feature'
<span class="red">origin/master</span> Your branch is ahead of 'origin/master' by 4 commits.
<strong><span class="aqua">cool_feature *&#8203;</span></strong> (use "git push" to publish your local commits)
<span class="green">subfeature</span> <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span class="green">frozen_changes</span> <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
<span class="green">master</span> </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature *
<span class="fuchsia">{NO UPSTREAM}</span> </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature
<span class="green">bogus_noparent</span></code></pre> </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</div></div> </span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
</span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
Switched to branch 'subfeature'
Your branch and 'cool_feature' have diverged,
and have 2 and 1 different commit each, respectively.
(use "git pull" to merge the remote branch into yours)
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> subfeature *
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch</span>
</code></pre></div></div><p><div class="paragraph"></p></div>
</div> </div>
</div> </div>
<div class="sect1"> <div class="sect1">
...@@ -821,7 +828,7 @@ file.</p></div> ...@@ -821,7 +828,7 @@ file.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -830,7 +837,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -830,7 +837,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:56:15 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-nav-upstream.html
View file @ 21980029
...@@ -770,26 +770,44 @@ checks that out.</p></div> ...@@ -770,26 +770,44 @@ checks that out.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_example">EXAMPLE</h2> <h2 id="_example">EXAMPLE</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="listingblock"> <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<div class="content"> <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
<pre><code><strong><span class="white">$ git map-branches</span></strong> </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
<span class="red">origin/master</span> </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> subfeature *
<span class="green">cool_feature</span> </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> fixit
<strong><span class="aqua">subfeature *&#8203;</span></strong> </span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
<span class="green">frozen_changes</span> </span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
<span class="green">master</span> Switched to branch 'cool_feature'
<span class="fuchsia">{NO UPSTREAM}</span> Your branch is ahead of 'origin/master' by 4 commits.
<span class="green">bogus_noparent</span> (use "git push" to publish your local commits)
<strong><span class="white">$ git nav-upstream</span></strong> <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<strong><span class="white">$ git map-branches</span></strong> <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
<span class="red">origin/master</span> </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature *
<strong><span class="aqua">cool_feature *&#8203;</span></strong> </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature
<span class="green">subfeature</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
<span class="green">frozen_changes</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
<span class="green">master</span> </span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
<span class="fuchsia">{NO UPSTREAM}</span> Note: checking out 'origin/master'.
<span class="green">bogus_noparent</span></code></pre>
</div></div> You are in 'detached HEAD' state. You can look around, make experimental</span> <b>&lt;1&gt;</b><span>
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 619ccc9... Make ReflectorImpl use mailboxes
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master *
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch</span>
</code></pre></div></div><p><div class="paragraph">
1. Note that being in a <em>detached HEAD</em> state is OK. You&#8217;ll just want to create
a <a href="git-new-branch.html">git-new-branch(1)</a> from here.</p></div>
</div> </div>
</div> </div>
<div class="sect1"> <div class="sect1">
...@@ -813,7 +831,7 @@ file.</p></div> ...@@ -813,7 +831,7 @@ file.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -822,7 +840,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -822,7 +840,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:57:27 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-new-branch.html
View file @ 21980029
...@@ -830,44 +830,48 @@ defaults to <em>origin/master</em>. This is considered to be the <em>root</em> ...@@ -830,44 +830,48 @@ defaults to <em>origin/master</em>. This is considered to be the <em>root</em>
<div class="sect1"> <div class="sect1">
<h2 id="_example">EXAMPLE</h2> <h2 id="_example">EXAMPLE</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="listingblock"> <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<div class="content"> <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
<pre><code><strong><span class="white">$ git map-branches</span></strong> </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
<span class="red">origin/master</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
<span class="green">cool_feature</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
<span class="green">subfeature</span> </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch *
<span class="aqua">frozen_changes *</span> </span><span style="font-weight: bold; color: #ffffff">$ git new-branch independent_cl</span>
<strong><span class="white">$ git new-branch independent_cl</span></strong> <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<strong><span class="white">$ git map-branches</span></strong> <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master
<span class="red">origin/master</span> </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature
<span class="green">cool_feature</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
<span class="green">subfeature</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
<span class="green">frozen_changes</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
<span class="aqua">independent_cl *</span> </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> independent_cl *
<strong><span class="white">$ git new-branch --upstream subfeature nested_cl</span></strong> </span><span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream subfeature nested_cl</span>
<strong><span class="white">$ git map-branches</span></strong> <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span class="red">origin/master</span> <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
<span class="green">cool_feature</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
<span class="aqua">subfeature</span> <b>&lt;1&gt;</b> </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> subfeature</span> <b>&lt;1&gt;</b><span>
<span class="aqua">nested_cl *</span> </span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> nested_cl *
<span class="green">frozen_changes</span> </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> fixit
<span class="green">independent_cl</span> </span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
<strong><span class="white">$ git checkout cool_feature</span></strong> </span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl
<strong><span class="white">$ git new-branch --upstream_current cl_depends_on_cool_feature</span></strong> </span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_feature</span>
<strong><span class="white">$ git map-branches</span></strong> Your branch is ahead of 'origin/master' by 4 commits.
<span class="red">origin/master</span> (use "git push" to publish your local commits)
<span class="aqua">cool_feature</span> <span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_current cl_depends_on_cool_feature</span>
<span class="aqua">cl_depends_on_cool_feature *</span> <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span class="green">subfeature</span> <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
<span class="green">nested_cl</span> </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature
<span class="green">frozen_changes</span> </span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cl_depends_on_cool_feature *
<span class="green">independent_cl</span></code></pre> </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature
</div></div> </span><span style="color: #19c518"></span><span style="color: #19c518"> nested_cl
<div class="colist arabic"><ol> </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl</span>
</code></pre></div></div><p><div class="paragraph"></p></div>
<div class="olist arabic"><ol class="arabic">
<li> <li>
<p> <p>
Note that both branches are cyan because they are currently the same Note that both branches are cyan because they are currently the same
<em>commit</em> object. See <a href=":git-map-branches.html">:git-map-branches(1)</a> for more detail. <em>commit</em> object. See <a href="git-map-branches.html">git-map-branches(1)</a> for more detail.
</p> </p>
</li> </li>
</ol></div> </ol></div>
...@@ -903,7 +907,7 @@ mnemonic: tb &#8594; "track branch" ...@@ -903,7 +907,7 @@ mnemonic: tb &#8594; "track branch"
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -912,7 +916,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -912,7 +916,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-rebase-update.html
View file @ 21980029
...@@ -921,7 +921,7 @@ file.</p></div> ...@@ -921,7 +921,7 @@ file.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -930,7 +930,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -930,7 +930,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-rename-branch.html
View file @ 21980029
...@@ -778,7 +778,7 @@ tracking information to preserve inter-branch dependencies.</p></div> ...@@ -778,7 +778,7 @@ tracking information to preserve inter-branch dependencies.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -787,7 +787,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -787,7 +787,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-reparent-branch.html
View file @ 21980029
...@@ -831,7 +831,7 @@ file.</p></div> ...@@ -831,7 +831,7 @@ file.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -840,7 +840,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -840,7 +840,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-squash-branch.html
View file @ 21980029
This diff is collapsed.
docs/html/git-thaw.html
View file @ 21980029
...@@ -778,7 +778,7 @@ freeze), <code>git thaw</code> will thaw all of the freezes.</p></div> ...@@ -778,7 +778,7 @@ freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -787,7 +787,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -787,7 +787,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:09:11 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/html/git-upstream-diff.html
View file @ 21980029
...@@ -871,7 +871,7 @@ file.</p></div> ...@@ -871,7 +871,7 @@ file.</p></div>
<div class="sect1"> <div class="sect1">
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools 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> from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div> </div>
...@@ -880,7 +880,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -880,7 +880,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-03-25 15:03:05 PDT Last updated 2014-04-10 14:23:11 PDT
</div> </div>
</div> </div>
</body> </body>
......
docs/man1/git-freeze.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-freeze .\" Title: git-freeze
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-FREEZE" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-FREEZE" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -41,6 +41,8 @@ git freeze works a lot like git stash, in that it stores the current changes in ...@@ -41,6 +41,8 @@ git freeze works a lot like git stash, in that it stores the current changes in
.sp .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\&.)\&. 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" .SH "EXAMPLE"
.sp
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -48,7 +50,7 @@ git freeze will make up to 2 commits on your branch\&. A commit with the message ...@@ -48,7 +50,7 @@ git freeze will make up to 2 commits on your branch\&. A commit with the message
.nf .nf
\fB$ git status \-\-short\fR \fB$ git status \-\-short\fR
A added_file A added_file
A\:M added_file_with_unstaged_changes AM added_file_with_unstaged_changes
D deleted_file D deleted_file
M modified_file M modified_file
D unstaged_deleted_file D unstaged_deleted_file
...@@ -56,32 +58,32 @@ D deleted_file ...@@ -56,32 +58,32 @@ D deleted_file
\fB$ git freeze\fR \fB$ git freeze\fR
\fB$ git status \-\-short\fR \fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR \fB$ git log \-n 2 \-\-stat\fR
commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd commit bed4472f2ad34bebabd7cf79f3155ebc6d86707d
Author: Robert Iannucci <iannucci@chromium\&.org> Author: local <local@chromium\&.org>
Date: Thu Mar 13 17:42:37 2014 \-0700 Date: Thu Apr 10 08:54:56 2014 +0000
FREEZE\&.unindexed FREEZE\&.unindexed
added_file_with_unstaged_changes | 3 ++\:\- added_file_with_unstaged_changes | 1 +
modified_file | 4 +++\:\- modified_file | 1 +
unadded_file | 3 +++ unadded_file | 0
unstaged_deleted_file | 1 \- unstaged_deleted_file | 1 \-
4 files changed, 8 insertions(+), 3 deletions(\-) 4 files changed, 2 insertions(+), 1 deletion(\-)
commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4 commit cde1eb5500ede60053ae47b3fb1231e9e62be793
Author: Robert Iannucci <iannucci@chromium\&.org> Author: local <local@chromium\&.org>
Date: Thu Mar 13 17:42:37 2014 \-0700 Date: Thu Apr 10 08:54:56 2014 +0000
FREEZE\&.indexed FREEZE\&.indexed
added_file | 3 +++ added_file | 1 +
added_file_with_unstaged_changes | 1 + added_file_with_unstaged_changes | 1 +
deleted_file | 1 \- deleted_file | 1 \-
3 files changed, 4 insertions(+), 1 deletion(\-) 3 files changed, 2 insertions(+), 1 deletion(\-)
\fB$ git thaw\fR \fB$ git thaw\fR
\fB$ git status \-\-short\fR \fB$ git status \-\-short\fR
A added_file A added_file
A\:M added_file_with_unstaged_changes AM added_file_with_unstaged_changes
D deleted_file D deleted_file
M modified_file M modified_file
D unstaged_deleted_file D unstaged_deleted_file
...@@ -96,7 +98,7 @@ D deleted_file ...@@ -96,7 +98,7 @@ D deleted_file
\fBgit-thaw\fR(1) \fBgit-thaw\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-map-branches.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-map-branches .\" Title: git-map-branches
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-MAP\-BRANCHES" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-MAP\-BRANCHES" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -129,6 +129,8 @@ If multiple branches are on the same commit, they will all be cyan\&. ...@@ -129,6 +129,8 @@ If multiple branches are on the same commit, they will all be cyan\&.
.SH "EXAMPLE" .SH "EXAMPLE"
.sp .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: 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
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -138,11 +140,10 @@ Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and ...@@ -138,11 +140,10 @@ Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and
origin/master origin/master
cool_feature cool_feature
subfeature subfeature
frozen_changes * fixit
master \fB frozen_branch *
{NO UPSTREAM} \fR{NO UPSTREAM}
bogus_noparent no_upstream
duplicate_cool_feature_no_upstream
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -168,7 +169,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon ...@@ -168,7 +169,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-map\fR(1) \fBgit-map\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-map.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-map .\" Title: git-map
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-MAP" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-MAP" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -138,21 +138,26 @@ Running \fIgit map\fR would result in an output something like: ...@@ -138,21 +138,26 @@ Running \fIgit map\fR would result in an output something like:
.\} .\}
.nf .nf
\fB$ git map\fR \fB$ git map\fR
*\:\fB 7dcfe47 \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-12 ~ FREEZE\&.unindexed \fB* a8f0220 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fB4b0c180\fR 2014\-03\-12 ~ modfile * \fBc382556 \fR 2014\-04\-10 ~ modfile
* \fB59a7cca\fR 2014\-03\-12 ~ a deleted file * \fB06e399f \fR 2014\-04\-10 ~ a deleted file
* \fB6bec695\fR (\:origin/master\:) 2014\-03\-11 ~ Add neat feature \fB<(frozen_changes)\fR * \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBd15a38a\fR 2014\-03\-11 ~ Epic README update * \fBf734bbf \fR 2014\-04\-10 ~ Epic README update
* \fBd559894\fR (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream change | * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| * \fB9c311fd\fR (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL comments | | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB2a1eeb2\fR (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with CoolService | | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action
| | * \fBd777af6\fR 2014\-03\-11 ~ slick commenting action
| |/ | |/
| * \fB265803a\fR 2014\-03\-11 ~ another improvement \fB<(subfeature)\fR | * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB6d831ac\fR (\:\fBspleen_tag\fR\:) 2014\-03\-11 ~ Refactor spleen | * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB82e74ab\fR 2014\-03\-11 ~ Add widget | * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget
|/ |/
* \fBd08c5b3\fR (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful beginnings \fB<(cool_feature)\fR * \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -165,7 +170,7 @@ As you can see, the structure of the commit history is visible, particularly wha ...@@ -165,7 +170,7 @@ As you can see, the structure of the commit history is visible, particularly wha
\fBgit-map-branches\fR(1) \fBgit-map-branches\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-mark-merge-base.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-mark-merge-base .\" Title: git-mark-merge-base
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-MARK\-MERGE\-BA" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-MARK\-MERGE\-BA" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -60,7 +60,7 @@ The new value to set for the current branch\(cqs merge\-base marker\&. ...@@ -60,7 +60,7 @@ The new value to set for the current branch\(cqs merge\-base marker\&.
\fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1) \fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-nav-downstream.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-nav-downstream .\" Title: git-nav-downstream
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 1ce0237
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-NAV\-DOWNSTREAM" "1" "04/10/2014" "depot_tools 1ce0237" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -39,34 +39,45 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out ...@@ -39,34 +39,45 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out
.sp .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\&. \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" .SH "EXAMPLE"
.sp
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
.\} .\}
.nf .nf
\fB$ git map\-branches\fR \fB$ git map\-branches\fR
\fBorigin/master *\:\fR \fBorigin/master *
cool_feature \fR cool_feature
subfeature subfeature
frozen_changes fixit
master frozen_branch
{NO UPSTREAM}
bogus_noparent
\fB$ git nav\-downstream\fR \fB$ git nav\-downstream\fR
Please select a downstream branch Please select a downstream branch
0\&. cool_feature 0\&. cool_feature
1\&. frozen_changes 1\&. fixit
2\&. master Selection (0\-1)[0]: 0
Selection (0\-2)[0]: 0 Previous HEAD position was 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes
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 \fB$ git map\-branches\fR
origin/master origin/master
\fBcool_feature *\:\fR \fB cool_feature *
subfeature \fR subfeature
frozen_changes fixit
master frozen_branch
{NO UPSTREAM} \fB$ git nav\-downstream\fR
bogus_noparent Switched to branch \*(Aqsubfeature\*(Aq
Your branch and \*(Aqcool_feature\*(Aq have diverged,
and have 2 and 1 different commit each, respectively\&.
(use "git pull" to merge the remote branch into yours)
\fB$ git map\-branches\fR
origin/master
cool_feature
\fB subfeature *
\fR fixit
frozen_branch
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -92,7 +103,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon ...@@ -92,7 +103,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-map-branches\fR(1), \fBgit-nav-upstream\fR(1) \fBgit-map-branches\fR(1), \fBgit-nav-upstream\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-nav-upstream.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-nav-upstream .\" Title: git-nav-upstream
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 1ce0237
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-NAV\-UPSTREAM" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-NAV\-UPSTREAM" "1" "04/10/2014" "depot_tools 1ce0237" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -39,6 +39,8 @@ git-nav-upstream \- Checkout the upstream branch of the currently checked out br ...@@ -39,6 +39,8 @@ git-nav-upstream \- Checkout the upstream branch of the currently checked out br
.sp .sp
\fIgit\-nav\-upstream\fR takes the current branch, finds it\*(Aqs upstream branch, and checks that out\&. \fIgit\-nav\-upstream\fR takes the current branch, finds it\*(Aqs upstream branch, and checks that out\&.
.SH "EXAMPLE" .SH "EXAMPLE"
.sp
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -47,25 +49,44 @@ git-nav-upstream \- Checkout the upstream branch of the currently checked out br ...@@ -47,25 +49,44 @@ git-nav-upstream \- Checkout the upstream branch of the currently checked out br
\fB$ git map\-branches\fR \fB$ git map\-branches\fR
origin/master origin/master
cool_feature cool_feature
\fBsubfeature *\:\fR \fB subfeature *
frozen_changes \fR fixit
master frozen_branch
{NO UPSTREAM}
bogus_noparent
\fB$ git nav\-upstream\fR \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 \fB$ git map\-branches\fR
origin/master origin/master
\fBcool_feature *\:\fR \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 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes
\fB$ git map\-branches\fR
\fBorigin/master *
\fR cool_feature
subfeature subfeature
frozen_changes fixit
master frozen_branch
{NO UPSTREAM}
bogus_noparent
.fi .fi
.if n \{\ .if n \{\
.RE .RE
.\} .\}
.sp .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" .SH "SUGGESTED ALIASES"
.sp .sp
Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&. Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&.
...@@ -86,7 +107,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon ...@@ -86,7 +107,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-map-branches\fR(1), \fBgit-nav-downstream\fR(1) \fBgit-map-branches\fR(1), \fBgit-nav-downstream\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-new-branch.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-new-branch .\" Title: git-new-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-NEW\-BRANCH" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-NEW\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -70,6 +70,8 @@ The name for the new branch\&. ...@@ -70,6 +70,8 @@ The name for the new branch\&.
.sp .sp
This configures the default \fIupstream\fR for all new branches\&. If it is unset, it defaults to \fIorigin/master\fR\&. This is considered to be the \fIroot\fR branch\&. This configures the default \fIupstream\fR for all new branches\&. If it is unset, it defaults to \fIorigin/master\fR\&. This is considered to be the \fIroot\fR branch\&.
.SH "EXAMPLE" .SH "EXAMPLE"
.sp
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -79,44 +81,59 @@ This configures the default \fIupstream\fR for all new branches\&. If it is unse ...@@ -79,44 +81,59 @@ This configures the default \fIupstream\fR for all new branches\&. If it is unse
origin/master origin/master
cool_feature cool_feature
subfeature subfeature
frozen_changes * fixit
\fB$ git new\-branch independent_cl\fR \fB frozen_branch *
$ git new\-branch independent_cl\fR
\fB$ git map\-branches\fR \fB$ git map\-branches\fR
origin/master \fBorigin/master
cool_feature \fR cool_feature
subfeature subfeature
frozen_changes fixit
independent_cl * frozen_branch
\fB$ git new\-branch \-\-upstream subfeature nested_cl\fR \fB independent_cl *
$ git new\-branch \-\-upstream subfeature nested_cl\fR
\fB$ git map\-branches\fR \fB$ git map\-branches\fR
origin/master origin/master
cool_feature cool_feature
subfeature \fB(1)\fR \fB subfeature \fR\fB\fB(1)\fR\fR\fB
nested_cl * nested_cl *
frozen_changes \fR fixit
frozen_branch
independent_cl independent_cl
\fB$ git checkout cool_feature\fR \fB$ git checkout cool_feature\fR
Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
(use "git push" to publish your local commits)
\fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR \fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR
\fB$ git map\-branches\fR \fB$ git map\-branches\fR
origin/master origin/master
cool_feature \fB cool_feature
cl_depends_on_cool_feature * cl_depends_on_cool_feature *
subfeature \fR subfeature
nested_cl nested_cl
frozen_changes fixit
frozen_branch
independent_cl independent_cl
.fi .fi
.if n \{\ .if n \{\
.RE .RE
.\} .\}
.sp .sp
.sp .sp
\fB1. \fRNote that both branches are cyan because they are currently the same .RS 4
.ie n \{\
\h'-04' 1.\h'+01'\c
.\}
.el \{\
.sp -1
.IP " 1." 4.2
.\}
Note that both branches are cyan because they are currently the same
\fIcommit\fR \fIcommit\fR
object\&. See object\&. See
\fB:git-map-branches\fR(1) \fBgit-map-branches\fR(1)
for more detail\&. for more detail\&.
.br .RE
.SH "SUGGESTED ALIASES" .SH "SUGGESTED ALIASES"
.sp .sp
Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&. Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&.
...@@ -141,7 +158,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon ...@@ -141,7 +158,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1) \fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-rebase-update.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-rebase-update .\" Title: git-rebase-update
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-REBASE\-UPDATE" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-REBASE\-UPDATE" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -156,7 +156,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon ...@@ -156,7 +156,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-new-branch\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1), \fBgit-freeze\fR(1), \fBgit-mark-merge-base\fR(1) \fBgit-new-branch\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1), \fBgit-freeze\fR(1), \fBgit-mark-merge-base\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-rename-branch.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-rename-branch .\" Title: git-rename-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-RENAME\-BRANCH" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-RENAME\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -44,7 +44,7 @@ Rename the current (or specified) branch, then update all dowstream branches\*(A ...@@ -44,7 +44,7 @@ Rename the current (or specified) branch, then update all dowstream branches\*(A
\fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-new-branch\fR(1), \fBgit-upstream-diff\fR(1) \fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-new-branch\fR(1), \fBgit-upstream-diff\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-reparent-branch.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-reparent-branch .\" Title: git-reparent-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-REPARENT\-BRANC" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-REPARENT\-BRANC" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -84,7 +84,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon ...@@ -84,7 +84,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-rebase-update\fR(1), \fBgit-rename-branch\fR(1), \fBgit-new-branch\fR(1), \fBgit-upstream-diff\fR(1) \fBgit-rebase-update\fR(1), \fBgit-rename-branch\fR(1), \fBgit-new-branch\fR(1), \fBgit-upstream-diff\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-squash-branch.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-squash-branch .\" Title: git-squash-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-SQUASH\-BRANCH" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-SQUASH\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -47,42 +47,54 @@ Squashing branches is useful when trying to rebase\-update over branches which w ...@@ -47,42 +47,54 @@ Squashing branches is useful when trying to rebase\-update over branches which w
Optional message to use for the first line of the squashed commit\&. If omitted, it defaults to "git squash commit\&."\&. Optional message to use for the first line of the squashed commit\&. If omitted, it defaults to "git squash commit\&."\&.
.RE .RE
.SH "EXAMPLE" .SH "EXAMPLE"
.sp
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
.\} .\}
.nf .nf
\fB$ git map\fR \fB$ git map\fR
*\:\fB 7dcfe47 \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-12 ~ FREEZE\&.unindexed \fB* a8f0220 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fB4b0c180\fR 2014\-03\-12 ~ modfile * \fBc382556 \fR 2014\-04\-10 ~ modfile
* \fB59a7cca\fR 2014\-03\-12 ~ a deleted file * \fB06e399f \fR 2014\-04\-10 ~ a deleted file
* \fB6bec695\fR (\:origin/master\:) 2014\-03\-11 ~ Add neat feature \fB<(frozen_changes)\fR * \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBd15a38a\fR 2014\-03\-11 ~ Epic README update * \fBf734bbf \fR 2014\-04\-10 ~ Epic README update
* \fBd559894\fR (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream change | * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| * \fB9c311fd\fR (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL comments | | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB2a1eeb2\fR (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with CoolService | | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action
| | * \fBd777af6\fR 2014\-03\-11 ~ slick commenting action
| |/ | |/
| * \fB265803a\fR 2014\-03\-11 ~ another improvement \fB<(subfeature)\fR | * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB6d831ac\fR (\:\fBspleen_tag\fR\:) 2014\-03\-11 ~ Refactor spleen | * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB82e74ab\fR 2014\-03\-11 ~ Add widget | * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget
|/ |/
* \fBd08c5b3\fR (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful beginnings \fB<(cool_feature)\fR * \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
\fB$ git squash\-branch "cool squash demo"\fR * \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR
\fB$ git map\fR \fB$ git map\fR
*\:\fB 2c81508 \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-22 ~ cool squash demo \fB* 5b451bd \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo
* \fB6bec695\fR (\:origin/master\:) 2014\-03\-11 ~ Add neat feature \fB<(frozen_changes)\fR * \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBd15a38a\fR 2014\-03\-11 ~ Epic README update * \fBf734bbf \fR 2014\-04\-10 ~ Epic README update
* \fBd559894\fR (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream change | * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| * \fB9c311fd\fR (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL comments | | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB2a1eeb2\fR (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with CoolService | | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action
| | * \fBd777af6\fR 2014\-03\-11 ~ slick commenting action
| |/ | |/
| * \fB265803a\fR 2014\-03\-11 ~ another improvement \fB<(subfeature)\fR | * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB6d831ac\fR (\:\fBspleen_tag\fR\:) 2014\-03\-11 ~ Refactor spleen | * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB82e74ab\fR 2014\-03\-11 ~ Add widget | * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget
|/ |/
* \fBd08c5b3\fR (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful beginnings \fB<(cool_feature)\fR * \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -108,7 +120,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon ...@@ -108,7 +120,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-rebase-update\fR(1) \fBgit-rebase-update\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-thaw.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-thaw .\" Title: git-thaw
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-THAW" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-THAW" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -45,7 +45,7 @@ If you freeze a branch multiple times (i\&.e\&. change files, freeze, change fil ...@@ -45,7 +45,7 @@ If you freeze a branch multiple times (i\&.e\&. change files, freeze, change fil
\fBgit-freeze\fR(1) \fBgit-freeze\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man1/git-upstream-diff.1
View file @ 21980029
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-upstream-diff .\" Title: git-upstream-diff
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/25/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 207bff1 .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-UPSTREAM\-DIFF" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" .TH "GIT\-UPSTREAM\-DIFF" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -110,7 +110,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon ...@@ -110,7 +110,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
\fBgit-rebase-update\fR(1) \fBgit-rebase-update\fR(1)
.SH "CHROMIUM DEPOT_TOOLS" .SH "CHROMIUM DEPOT_TOOLS"
.sp .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\&. 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" .SH "NOTES"
.IP " 1." 4 .IP " 1." 4
here here
......
docs/man7/depot_tools.7
View file @ 21980029
'\" t '\" t
.\" Title: depot_tools .\" Title: depot_tools
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/26/2014 .\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 9c0c59f .\" Source: depot_tools 68b1017
.\" Language: English .\" Language: English
.\" .\"
.TH "DEPOT_TOOLS" "7" "03/26/2014" "depot_tools 9c0c59f" "Chromium depot_tools Manual" .TH "DEPOT_TOOLS" "7" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -39,6 +39,8 @@ Other tools are merely \fIhelper\fR tools\&. Not required, but they can substant ...@@ -39,6 +39,8 @@ Other tools are merely \fIhelper\fR tools\&. Not required, but they can substant
.sp .sp
A listing of both categories of tools follows\&. A listing of both categories of tools follows\&.
.SH "HELPER TOOLS" .SH "HELPER TOOLS"
.sp
A tutorial for these tools can be found at \fBdepot_tools_tutorial\fR(7)\&.
.PP .PP
\fBgit-freeze\fR(1) \fBgit-freeze\fR(1)
.RS 4 .RS 4
......
docs/man7/depot_tools_tutorial.7 0 → 100644
View file @ 21980029
This diff is collapsed.
docs/src/.gitignore
View file @ 21980029
git git
asciidoc asciidoc
__*.txt demo_repo
\ No newline at end of file ansi2html
__*.txt
docs/src/_footer.txt
View file @ 21980029
CHROMIUM DEPOT_TOOLS CHROMIUM DEPOT_TOOLS
-------------------- --------------------
Part of the chromium linkgit:depot_tools[1] suite. These tools are meant to Part of the chromium linkgit:depot_tools[7] suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools assist with the development of chromium and related projects. Download the tools
from link:{sys3:git config remote.origin.url}[here]. from link:{sys3:git config remote.origin.url}[here].
......
docs/src/_helper_prefix.txt 0 → 100644
View file @ 21980029
A tutorial for these tools can be found at linkgit:depot_tools_tutorial[7].
docs/src/common_demo_functions.sh 0 → 100755
View file @ 21980029
#!/bin/bash
REMOTE=$(pwd)/demo_repo
unset GIT_DIR
# Helper functions
set_user() {
export GIT_AUTHOR_EMAIL="$1@chromium.org"
export GIT_AUTHOR_NAME="$1"
export GIT_COMMITTER_EMAIL="$1@chromium.org"
export GIT_COMMITTER_NAME="$1"
}
set_user 'local'
# increment time by X seconds
TIME=1397119976
tick() {
TIME=$[$TIME + $1]
export GIT_COMMITTER_DATE="$TIME +0000"
export GIT_AUTHOR_DATE="$TIME +0000"
}
tick 0
# a commit
c() {
silent git commit --allow-empty -m "$1"
tick 10
}
praw() {
echo -e "\x1B[37;1m$ $@\x1B[m"
}
# print a visible command (but don't run it)
pcommand() {
praw "$(python -c '\
import sys, pipes; \
print " ".join(map(pipes.quote, sys.argv[1:]))' "$@")"
}
# run a visible command
run() {
pcommand "$@"
"$@"
}
comment() {
echo "# $@"
}
# run a silent command
silent() {
if [[ $DEBUG ]]
then
"$@"
else
"$@" > /dev/null 2> /dev/null
fi
}
# add a file with optionally content
add() {
local CONTENT=$2
if [[ ! $CONTENT ]]
then
CONTENT=$(python -c 'import random, string; \
print "".join(random.sample(string.lowercase, 16))')
fi
echo "$CONTENT" > $1
silent git add $1
}
# Add a special callout marker at the given line offset to indicate to
# filter_demo_output.py to add a callout at that offset.
callout() {
echo -e "\x1b[${1}c"
}
docs/src/demo_repo.sh 0 → 100755
View file @ 21980029
#!/bin/bash
. common_demo_functions.sh
TDIR=$(mktemp --tmpdir -d demo_repo.XXXXXXXXXX)
trap "rm -rf $TDIR" EXIT
cd $TDIR
silent git clone "$REMOTE" .
silent git reset --hard stage_1
silent git update-ref refs/remotes/origin/master stage_1
silent git tag -d $(git tag -l 'stage_*')
silent git checkout origin/master
silent git branch -d master
silent git config color.ui always
if [[ ! "$BLANK_DEMO" ]]
then
silent git new-branch cool_feature
c "Add widget"
c "Refactor spleen"
silent git tag spleen_tag
c "another improvement"
silent git new-branch --upstream_current subfeature
c "slick commenting action"
c "integrate with CoolService"
silent git checkout cool_feature
c "Respond to CL comments"
silent git new-branch fixit
c "Epic README update"
c "Add neat feature"
silent git new-branch --upstream_current frozen_branch
c "a deleted file"
c "modfile"
c "FREEZE.unindexed"
fi
docs/src/depot_tools_tutorial.demo.tldr.sh 0 → 100755
View file @ 21980029
#!/bin/bash
BLANK_DEMO=1
. demo_repo.sh
trunc() {
echo ... truncated output ...
}
trunc_command() {
pcommand "$@"
trunc
}
WS=build/whitespace_file.txt
add_ws() {
praw cat '>>' $WS '<<EOF'
echo -e "$1"
echo EOF
echo -e "$1" >> $WS
}
ed_ws() {
echo -ne "\x1B[37;1m$ echo -e "
echo -n "'$1'"
echo -e " | ed $WS\x1B[m"
echo -e "$1" | ed $WS
}
# needs an extra echo afterwards
map() {
run git map
echo
}
ED1='/Banana\ns/Banana/Kuun\nwq'
ADD1="
\"You recall what happened on Mulholland drive?\" The ceiling fan rotated slowly
overhead, barely disturbing the thick cigarette smoke. No doubt was left about
when the fan was last cleaned."
ED2='/Kuun\ns/Kuun/Kun\nwq'
ADD2="
There was an poignant pause."
ADD3="
CHAPTER 3:
Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he
began feeling sick."
trunc_command fetch chromium
pcommand cd src
comment "(only on linux)"
trunc_command ./build/install-build-deps.sh
comment "Pull in all dependencies for HEAD"
trunc_command gclient sync
comment "Let's fix something!"
run git new-branch fix_typo
ed_ws "$ED1"
run git commit -am 'Fix terrible typo.'
map
run git status
trunc_command git cl upload -r domo@chromium.org --send-mail
comment "While we wait for feedback, let's do something else."
run git new-branch chap2
run git map-branches
add_ws "$ADD1"
run git status
comment "Someone on the code review pointed out that our typo-fix has a typo :("
comment "We're still working on 'chap2' but we really want to land"
comment "'fix_typo', so let's switch over and fix it."
run git freeze
run git checkout fix_typo 2>&1
ed_ws "$ED2"
run git upstream-diff --wordwise
run git commit -am 'Fix typo for good!'
trunc_command git cl upload
comment "Since we got lgtm, let the CQ land it."
pcommand git cl set_commit
map
comment "Switch back to where we were using the nav* commands (for fun..."
comment "git checkout would work here too)"
run git map-branches
run git nav-upstream 2>&1
pcommand git nav-downstream
git nav-downstream --pick 0 2>&1
run git map-branches
comment "Now we can pick up on chapter2 where we left off."
run git thaw
run git diff
add_ws "$ADD2"
run git diff
run git commit -am 'Finish chapter 2'
map
trunc_command git cl upload -r domo@chromium.org --send-mail
comment "We poke a committer until they lgtm :)"
pcommand git cl set_commit
comment "While that runs through the CQ, let's get started on chapter 3."
comment "Since we know that chapter 3 depends on chapter 2, we'll track the"
comment "current chapter2 branch."
run git new-branch --upstream_current chap3
add_ws "$ADD3"
run git commit -am 'beginning of chapter 3'
map
comment "We haven't updated the code in a while, so let's do that now."
pcommand git rebase-update
echo Fetching origin
git fetch origin 2>&1 | grep -v 'stage'
silent git update-ref refs/remotes/origin/master stage_2
silent git tag -d $(git tag -l 'stage_*')
git rebase-update --no_fetch
comment "Well look at that. The CQ landed our typo and chapter2 branches "
comment "already and git rebase-update cleaned them up for us."
trunc_command gclient sync
map
comment "Someone on IRC mentions that they actually landed a chapter 3 already!"
comment "We should pull their changes before continuing. Brace for"
comment "a code conflict!"
pcommand git rebase-update
echo Fetching origin
git fetch origin 2>&1 | grep -v 'stage'
silent git tag -d $(git tag -l 'stage_*')
echo Rebasing: chap2
silent git rebase-update
echo ... lots of output, it\'s a conflict alright :\(...
run git diff
comment "Oh, well, that's not too bad. In fact... that's a terrible chapter 3!"
praw \$EDITOR "$WS"
echo "... /me deletes bad chapter 3 ..."
silent git checkout --theirs -- "$WS"
run git add "$WS"
run git diff --cached
comment "Much better"
run git rebase --continue
run git rebase-update
silent git tag -d $(git tag -l 'stage_*')
trunc_command gclient sync
map
trunc_command git cl upload
docs/src/depot_tools_tutorial.txt 0 → 100644
View file @ 21980029
This diff is collapsed.
docs/src/filter_demo_output.py 0 → 100755
View file @ 21980029
#!/usr/bin/env python
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import collections
import os
import re
import sys
from xml.sax.saxutils import escape
from cStringIO import StringIO
if not os.path.exists('ansi2html'):
print 'You must run ./make_docs.sh once before running this script.'
sys.exit(1)
# This dependency is pulled in by make_docs.sh
# if it doesn't exist, run ./make_docs.sh first
sys.path.insert(0, 'ansi2html')
import ansi2html # pylint: disable=F0401, W0611
import ansi2html.converter # pylint: disable=F0401, W0611
def simpleXML(string):
BRIGHT = 1
DIM = 2
NORMAL = 22
RESET = 0
ESC_RE = re.compile('(\x1B\\[[^m]*?)m')
ret = StringIO()
boldstate = False
for tok in ESC_RE.split(string):
if not tok:
continue
if tok[0] == '\x1b':
codes = map(int, filter(bool, tok[2:].split(';')))
if not codes:
codes = [RESET]
for code in codes:
# only care about Bright
if code == BRIGHT and boldstate is False:
boldstate = True
ret.write('<emphasis role="strong">')
elif code in (DIM, NORMAL, RESET) and boldstate:
boldstate = False
ret.write('</emphasis>')
else:
ret.write(escape(tok))
if boldstate:
ret.write('</emphasis>')
return ret.getvalue()
def main():
ansi2html.converter.SCHEME['custom'] = (
"#000000", "#e42e16", "#19c518", "#e7e71c", "#492ee1",
"#d338d3", "#33d6e5", "#ffffff",
)
backend = sys.argv[1]
output = sys.stdin.read().rstrip()
callout_re = re.compile('\x1b\[(\d+)c\n')
callouts = collections.defaultdict(int)
for i, line in enumerate(output.splitlines(True)):
m = callout_re.match(line)
if m:
callouts[i + int(m.group(1)) - len(callouts)] += 1
output = callout_re.sub('', output)
w = sys.stdout.write
callout_counter = 1
if backend == 'xhtml11':
preamble = (
'</p></div><div class="listingblock"><div class="content"><pre><code>'
)
postamble = '</code></pre></div></div><p><div class="paragraph">'
c = ansi2html.Ansi2HTMLConverter(inline=True, scheme='custom')
in_code = False
body = c.convert(output, full=False)
for i, line in enumerate(body.splitlines()):
if line.startswith('# '):
if in_code:
w(postamble)
in_code = False
w(line[1:])
else:
if not in_code:
w(preamble)
in_code = True
ext = ''
for _ in xrange(callouts[i]):
if not ext:
ext += '</span>'
ext += ' <b>&lt;%d&gt;</b>' % callout_counter
callout_counter += 1
if ext:
ext += '<span>'
w(line + ext + '\n')
if in_code:
w(postamble)
else:
preamble = '</simpara><literallayout class="monospaced">'
postamble = '</literallayout><simpara>'
in_code = False
body = simpleXML(output)
for i, line in enumerate(body.splitlines()):
if line.startswith('# '):
if in_code:
w(postamble)
in_code = False
w(line[1:])
else:
if not in_code:
w(preamble)
in_code = True
ext = ''
for _ in xrange(callouts[i]):
ext += ' <emphasis role="strong">(%d)</emphasis>' % callout_counter
callout_counter += 1
w(line + ext + '\n')
if in_code:
w(postamble)
if __name__ == '__main__':
main()
docs/src/git-freeze.demo.1.sh 0 → 100755
View file @ 21980029
#!/bin/sh
. demo_repo.sh
add deleted_file
add unstaged_deleted_file
add modified_file
c "demo changes"
add added_file_with_unstaged_changes
echo bob >> added_file_with_unstaged_changes
add added_file
echo bob >> modified_file
silent git rm deleted_file
rm unstaged_deleted_file
touch unadded_file
run git status --short
run git freeze
run git status --short
run git log -n 2 --stat
run git thaw
run git status --short
docs/src/git-freeze.txt
View file @ 21980029
...@@ -28,50 +28,7 @@ time you ran git freeze (freshly modified files, new files, etc.). ...@@ -28,50 +28,7 @@ time you ran git freeze (freshly modified files, new files, etc.).
EXAMPLE EXAMPLE
------- -------
demo:1[]
[subs="specialcharacters,quotes,attributes"]
----
[white]**$ git status --short**
[green]##A## added_file
[green]##A##{zwsp}[red]##M## added_file_with_unstaged_changes
[green]##D## deleted_file
[red]##M## modified_file
[red]##D## unstaged_deleted_file
[red]##??## unadded_file
[white]**$ git freeze**
[white]**$ git status --short**
[white]**$ git log -n 2 --stat**
[yellow]##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 [green]##\+\+##{zwsp}[red]##-##
modified_file | 4 [green]##\+\+\+##{zwsp}[red]##-##
unadded_file | 3 [green]##\+\+\+##
unstaged_deleted_file | 1 [red]##-##
4 files changed, 8 insertions(\+), 3 deletions(-)
[yellow]##commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4##
Author: Robert Iannucci <iannucci@chromium.org>
Date: Thu Mar 13 17:42:37 2014 -0700
FREEZE.indexed
added_file | 3 [green]##\+\+\+##
added_file_with_unstaged_changes | 1 [green]##\+##
deleted_file | 1 [red]##-##
3 files changed, 4 insertions(+), 1 deletion(-)
[white]**$ git thaw**
[white]**$ git status --short**
[green]##A## added_file
[green]##A##{zwsp}[red]##M## added_file_with_unstaged_changes
[green]##D## deleted_file
[red]##M## modified_file
[red]##D## unstaged_deleted_file
[red]##??## unadded_file
----
SEE ALSO SEE ALSO
-------- --------
......
docs/src/git-map-branches.demo.1.sh 0 → 100755
View file @ 21980029
#!/bin/sh
. demo_repo.sh
silent git branch no_upstream HEAD~
run git map-branches
docs/src/git-map-branches.txt
View file @ 21980029
...@@ -35,18 +35,7 @@ Given the hypothetical demo repo in linkgit:git-map[1]\'s EXAMPLE section, and ...@@ -35,18 +35,7 @@ Given the hypothetical demo repo in linkgit:git-map[1]\'s EXAMPLE section, and
assuming that the `frozen_changes` branch was currently checked out, running assuming that the `frozen_changes` branch was currently checked out, running
'git map-branches' would result in an output like: 'git map-branches' would result in an output like:
[subs="quotes"] demo:1[]
----
[white]**$ git map-branches**
[red]#origin/master#
[green]#cool_feature#
[green]#subfeature#
[aqua]#frozen_changes *#
[green]#master#
[fuchsia]#{NO UPSTREAM}#
[green]#bogus_noparent#
[aqua]#duplicate_cool_feature_no_upstream#
----
include::_aliases.txt[] include::_aliases.txt[]
...@@ -61,4 +50,4 @@ linkgit:git-map[1] ...@@ -61,4 +50,4 @@ linkgit:git-map[1]
include::_footer.txt[] include::_footer.txt[]
// vim: ft=asciidoc: // vim: ft=asciidoc:
\ No newline at end of file
docs/src/git-map.demo.1.sh 0 → 100755
View file @ 21980029
#!/bin/sh
. demo_repo.sh
run git map
docs/src/git-map.txt
View file @ 21980029
...@@ -51,26 +51,7 @@ EXAMPLE ...@@ -51,26 +51,7 @@ EXAMPLE
------- -------
Running 'git map' would result in an output something like: Running 'git map' would result in an output something like:
demo:1[]
[subs="specialcharacters,quotes,attributes"]
----
[white]**$ git map**
[white blue-background]##*##{zwsp}[blue-background red]** 7dcfe47 ** [green]##(##{zwsp}[aqua]**frozen_changes**{zwsp}[green]##)## [yellow]##2014-03-12## \~ FREEZE.unindexed
* [red]**4b0c180** [yellow]##2014-03-12## \~ modfile
* [red]**59a7cca** [yellow]##2014-03-12## \~ a deleted file
* [red]**6bec695** [green]##(##{zwsp}[red]##origin/master##{zwsp}[green]##)## [yellow]##2014-03-11## \~ Add neat feature [white]**<(frozen_changes)**
* [red]**d15a38a** [yellow]##2014-03-11## \~ Epic README update
* [red]**d559894** [green]##(##{zwsp}[lime]**master**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Important upstream change
[red]##|## * [red]**9c311fd** [green]##(##{zwsp}[lime]**cool_feature**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Respond to CL comments
[red]##|## [green]##|## * [red]**2a1eeb2** [green]##(##{zwsp}[lime]**subfeature**{zwsp}[green]##)## [yellow]##2014-03-11## \~ integrate with CoolService
[red]##|## [green]##|## * [red]**d777af6** [yellow]##2014-03-11## \~ slick commenting action
[red]##|## [green]##|/##
[red]##|## * [red]**265803a** [yellow]##2014-03-11## \~ another improvement [white]**<(subfeature)**
[red]##|## * [red]**6d831ac** [green]##(##{zwsp}[fuchsia]**spleen_tag**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Refactor spleen
[red]##|## * [red]**82e74ab** [yellow]##2014-03-11## \~ Add widget
[red]##|/##
* [red]**d08c5b3** [green]##(##{zwsp}[lime]**bogus_noparent**{zwsp}[green]##)## [yellow]##2014-03-11## ~ Wonderful beginnings [white]**<(cool_feature)**
----
As you can see, the structure of the commit history is visible, particularly 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 'upstream' what the parents of each commit are. In order to see the 'upstream'
...@@ -83,4 +64,4 @@ linkgit:git-map-branches[1] ...@@ -83,4 +64,4 @@ linkgit:git-map-branches[1]
include::_footer.txt[] include::_footer.txt[]
// vim: ft=asciidoc: // vim: ft=asciidoc:
\ No newline at end of file
docs/src/git-nav-downstream.demo.1.sh 0 → 100755
View file @ 21980029
#!/bin/sh
. demo_repo.sh
silent git checkout origin/master
run git map-branches
pcommand git nav-downstream
git nav-downstream --pick 0 2>&1
run git map-branches
run git nav-downstream 2>&1
run git map-branches
docs/src/git-nav-downstream.txt
View file @ 21980029
This diff is collapsed.
docs/src/git-nav-upstream.demo.1.sh 0 → 100755
View file @ 21980029
This diff is collapsed.
docs/src/git-nav-upstream.txt
View file @ 21980029
This diff is collapsed.
docs/src/git-new-branch.demo.1.sh 0 → 100755
View file @ 21980029
This diff is collapsed.
docs/src/git-new-branch.txt
View file @ 21980029
This diff is collapsed.
docs/src/git-squash-branch.demo.1.sh 0 → 100755
View file @ 21980029
This diff is collapsed.
docs/src/git-squash-branch.txt
View file @ 21980029
This diff is collapsed.
docs/src/make_docs.sh
View file @ 21980029
This diff is collapsed.
docs/src/prep_demo_repo.sh 0 → 100755
View file @ 21980029
This diff is collapsed.
git_common.py
View file @ 21980029
This diff is collapsed.
git_nav_downstream.py
View file @ 21980029
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