Commit 442fb64c authored by Quinten Yearsley's avatar Quinten Yearsley Committed by Commit Bot

depot_tools: Run automatic spell-checker.

Specifically, this CL was made by running codespell
(https://github.com/lucasdemarchi/codespell), manually filtering
for changes in non-third-party files that appear correct.

Change-Id: Ia16c1b29483d777744450d7bea45a178cf877a25
Reviewed-on: https://chromium-review.googlesource.com/420871
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: 's avatarAaron Gable <agable@chromium.org>
parent 516fe7f8
......@@ -53,7 +53,7 @@ To contribute change for review:
# Edit change description if needed.
git cl desc
# If change is approved, flag it to be commited.
# If change is approved, flag it to be committed.
git cl set-commit
# If change needs more work.
......
......@@ -26,7 +26,7 @@ Through a comedy of history, each binary is stored and retrieved differently.
### Git
Git installs are mirrored versions of the offical Git-for-Windows Portable
Git installs are mirrored versions of the official Git-for-Windows Portable
releases.
* Original: `https://github.com/git-for-windows/git/releases`
* Mirror: `gs://chrome-infra/PortableGit*.7z.exe`
......
......@@ -1055,7 +1055,7 @@ class _GitNumbererState(object):
# Early exit to avoid extra fetches for repos that aren't using gnumbd.
return cls(cls._get_pending_prefix_fallback(), None)
# This pollutes local ref space, but the amount of objects is neglible.
# This pollutes local ref space, but the amount of objects is negligible.
error, _ = cls._run_git_with_code([
'fetch', remote_url,
'+refs/meta/config:refs/git_cl/meta/config',
......@@ -2553,7 +2553,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
* 'unsent' - no reviewers added
* 'waiting' - waiting for review
* 'reply' - waiting for owner to reply to review
* 'not lgtm' - Code-Review disaproval from at least one valid reviewer
* 'not lgtm' - Code-Review disapproval from at least one valid reviewer
* 'lgtm' - Code-Review approval from at least one valid reviewer
* 'commit' - in the commit queue
* 'closed' - abandoned
......
......@@ -756,12 +756,12 @@ depot_tools(7) Manual Page
<div class="sectionbody">
<div class="paragraph"><p>The Chromium depot_tools suite contains many tools to assist/augment the
Chromium development environment. The tools may be downloaded from
<a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
<div class="paragraph"><p>There are two primary categories of tools. Some of these tools are <em>essential</em>
to the development flow, in the sense that you cannot successfully develop
Chromium without them.</p></div>
<div class="paragraph"><p>Other tools are merely <em>helper</em> tools. Not required, but they can substantially
ease the develpment workflow.</p></div>
ease the development workflow.</p></div>
<div class="paragraph"><p>A listing of both categories of tools follows.</p></div>
</div>
</div>
......@@ -927,7 +927,7 @@ Print a diff of the current branch, compared to its upstream.
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -1580,7 +1580,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-09-28 15:37:50 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -801,14 +801,14 @@ Finalizing upload: OK
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -858,7 +858,7 @@ at least once to fetch the branches.</p></div>
<h4 id="_merge_example">Merge Example</h4>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
<span style="color: #e7e71c">commit f1b2947cd99ad36614e71a51a925a6dae060fecd</span>
<span style="color: #e7e71c">commit 3b3f7e1631a521457357228c2048e647c60e67bd</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer &lt;some.committer@chromium.org&gt;
......@@ -867,10 +867,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick f1b2947cd99ad36614e71a51a925a6dae060fecd</span>
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 3b3f7e1631a521457357228c2048e647c60e67bd</span>
Going to cherry-pick
"""
<span style="color: #e7e71c">commit f1b2947cd99ad36614e71a51a925a6dae060fecd</span>
<span style="color: #e7e71c">commit 3b3f7e1631a521457357228c2048e647c60e67bd</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
Date: Thu Apr 10 08:54:46 2014 +0000
......@@ -888,7 +888,7 @@ About to land on 9999. Continue (y/n)? y
<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
<span style="color: #e7e71c">commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</span>
<span style="color: #e7e71c">commit 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer &lt;some.committer@chromium.org&gt;
......@@ -897,10 +897,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</span>
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662</span>
Going to cherry-pick
"""
<span style="color: #e7e71c">commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</span>
<span style="color: #e7e71c">commit 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
Date: Thu Apr 10 08:54:46 2014 +0000
......@@ -942,24 +942,24 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
# Here's the commit we want to revert.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
<span style="color: #e7e71c">commit d281ba6029d6bff1368a5885be8e2c638e1bfe73</span>
<span style="color: #e7e71c">commit 302334dbd2dca060814ffd3567808f2beafbf647</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
Date: Thu Apr 10 08:54:46 2014 +0000
This change is horribly broken.
# Now do the revert.
<span style="font-weight: bold; color: #ffffff">$ git revert d281ba6029d6bff1368a5885be8e2c638e1bfe73</span>
<span style="font-weight: bold; color: #ffffff">$ git revert 302334dbd2dca060814ffd3567808f2beafbf647</span>
# That reverted the change and committed the revert.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
<span style="color: #e7e71c">commit 7eb05d0f8e79ef563684500dc38d0dee069f7dc6</span>
<span style="color: #e7e71c">commit dd4742441d71cf2b8f403ff9ca819b3201de3c5b</span>
Author: you &lt;you@chromium.org&gt;
Date: Thu Apr 10 09:11:36 2014 +0000
Revert "This change is horribly broken."
This reverts commit d281ba6029d6bff1368a5885be8e2c638e1bfe73.
This reverts commit 302334dbd2dca060814ffd3567808f2beafbf647.
# As with old drover, reverts are generally OK to commit without LGTM.
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committer@chromium.org --send-mail</span>
......@@ -974,7 +974,7 @@ Using 50% similarity for rename/copy detection. Override with --similarity.
# Here's a commit (from some.committer) that we want to 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
<span style="color: #e7e71c">commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422</span>
<span style="color: #e7e71c">commit 441c947b3ff6e1d6b9036d67926011fbea92724f</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer &lt;some.committer@chromium.org&gt;
......@@ -988,8 +988,8 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
# Now do the 'drover'.
# IMPORTANT!!! Do Not leave off the '-x' flag
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x b9199aa1ab7d60a1e127de8c46c0983d13f2c422</span>
[drover_9999 729161e] This change needs to go to branch 9999
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 441c947b3ff6e1d6b9036d67926011fbea92724f</span>
[drover_9999 c7b0d40] This change needs to go to branch 9999
Author: some.committer &lt;some.committer@chromium.org&gt;
Date: Thu Apr 10 08:54:46 2014 +0000
1 file changed, 1 insertion(+)
......@@ -998,7 +998,7 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
# That took the code authored by some.committer and committed it to
# the branch by the person who drovered it (i.e. you).
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
<span style="color: #e7e71c">commit 729161e36af15142cdf591021de71e70e0db1ea2</span>
<span style="color: #e7e71c">commit c7b0d40c9f5793a27043688183a48597e656adcc</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: you &lt;you@chromium.org&gt;
......@@ -1006,7 +1006,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
This change needs to go to branch 9999
(cherry picked from commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422)
(cherry picked from commit 441c947b3ff6e1d6b9036d67926011fbea92724f)
# Looks good. Ship it!
<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
......@@ -1030,14 +1030,14 @@ Using 50% similarity for rename/copy detection. Override with --similarity.
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -864,14 +864,14 @@ refs/heads/master
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -790,7 +790,7 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
<span style="font-weight: bold; color: #ffffff">$ git freeze</span>
<span style="font-weight: bold; color: #ffffff">$ git status --short</span>
<span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
<span style="color: #e7e71c">commit 42c38320f46c6bc9a8aba7f15b41971e5f1db75b</span>
<span style="color: #e7e71c">commit c819cf561064339cde3dff88311c4fa63ce35d5c</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -802,7 +802,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
4 files changed, 2 insertions(+), 1 deletion(-)
<span style="color: #e7e71c">commit 5e0079a0fd55960682c389e71e0283594a80c02b</span>
<span style="color: #e7e71c">commit 5ab592982f141dd6857ee2ddd4aa5b97e2c13746</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -845,14 +845,14 @@ limit disables the size-limit check entirely. <strong>100</strong> by default.</
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -864,14 +864,14 @@ other more invasive changes.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -858,14 +858,14 @@ file.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -873,14 +873,14 @@ branch), use the <a href="git-map-branches.html">git-map-branches(1)</a> command
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -812,14 +812,14 @@ configuration variable for more info on what the merge base markers are for.</p>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -830,14 +830,14 @@ file.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -833,14 +833,14 @@ file.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -910,14 +910,14 @@ mnemonic: tb &#8594; "track branch"
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -928,14 +928,14 @@ file.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -780,14 +780,14 @@ tracking information to preserve inter-branch dependencies.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -833,14 +833,14 @@ file.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -851,7 +851,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-09-02 15:58:02 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -766,7 +766,7 @@ git-squash-branch(1) Manual Page
<div class="paragraph"><p><code>git squash-branch</code> is a simple helper command. It takes all the commits on the
current branch from the <em>merge_base</em> to HEAD, and reduces them to a single
commit. The new commit will contain a summary of all the commits which were
squashed, preceeded by a header message indicating that it&#8217;s the result of a
squashed, preceded by a header message indicating that it&#8217;s the result of a
squash (or the message you pass on the command line.).</p></div>
<div class="paragraph"><p>Squashing branches is useful when trying to rebase-update over branches which
were pushed to their upsteram (or committed by the <em>Commit Queue</em>), and then
......@@ -867,14 +867,14 @@ file.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -780,14 +780,14 @@ freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -763,7 +763,7 @@ git-upstream-diff(1) Manual Page
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Shows a diff beween your current branch and it&#8217;s upstream. This is <em>roughly</em> the
<div class="paragraph"><p>Shows a diff between your current branch and it&#8217;s upstream. This is <em>roughly</em> the
same as:</p></div>
<div class="listingblock">
<div class="content">
......@@ -884,14 +884,14 @@ file.</p></div>
<div class="sectionbody">
<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
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2016-07-21 10:09:00 PDT
Last updated 2016-12-15 15:36:52 PST
</div>
</div>
</body>
......
......@@ -2,12 +2,12 @@
.\" Title: git-cherry-pick-upload
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-CHERRY\-PICK\-U" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-CHERRY\-PICK\-U" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -76,5 +76,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-drover
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-DROVER" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-DROVER" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -101,7 +101,7 @@ Before working with branches, you must \fIgclient sync \-\-with_branch_heads\fR
.nf
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
commit 26e52487417bedec18e38b4937c721769275ac89
commit 067e08ebd511040fa9d5350da54112300d9c1801
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
......@@ -110,10 +110,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the \*(Aqdrover\*(Aq\&.
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 26e52487417bedec18e38b4937c721769275ac89\fR
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 067e08ebd511040fa9d5350da54112300d9c1801\fR
Going to cherry\-pick
"""
commit 26e52487417bedec18e38b4937c721769275ac89
commit 067e08ebd511040fa9d5350da54112300d9c1801
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
......@@ -148,7 +148,7 @@ About to land on 9999\&. Continue (y/n)? y
.nf
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
commit 0a1d0509ed8d7c486107d7288287b3c05b97a916
commit e4fdcfa1a16c8b7265fb74a20cd029aa75cecaa8
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
......@@ -157,10 +157,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the \*(Aqdrover\*(Aq\&.
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 0a1d0509ed8d7c486107d7288287b3c05b97a916\fR
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick e4fdcfa1a16c8b7265fb74a20cd029aa75cecaa8\fR
Going to cherry\-pick
"""
commit 0a1d0509ed8d7c486107d7288287b3c05b97a916
commit e4fdcfa1a16c8b7265fb74a20cd029aa75cecaa8
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
......@@ -219,24 +219,24 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
# Here\*(Aqs the commit we want to revert\&.
\fB$ git log \-n 1\fR
commit 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0
commit 00b47037e6732455c6b90f8800f4ffe5fbe7326d
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
This change is horribly broken\&.
# Now do the revert\&.
\fB$ git revert 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0\fR
\fB$ git revert 00b47037e6732455c6b90f8800f4ffe5fbe7326d\fR
# That reverted the change and committed the revert\&.
\fB$ git log \-n 1\fR
commit 84f214d895434bee2ab9aa08562f71a25891a31d
commit e31cae25b69f773e05ea206848d1479315f2e349
Author: you <you@chromium\&.org>
Date: Thu Apr 10 09:11:36 2014 +0000
Revert "This change is horribly broken\&."
This reverts commit 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0\&.
This reverts commit 00b47037e6732455c6b90f8800f4ffe5fbe7326d\&.
# As with old drover, reverts are generally OK to commit without LGTM\&.
\fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR
......@@ -268,7 +268,7 @@ Using 50% similarity for rename/copy detection\&. Override with \-\-similarity\&
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
commit aecb0b589f95d2efd6a32294cc6e6afb085f6b87
commit 87e5c05985d9c2ee235c6b7b5d29cc50f45783db
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
......@@ -282,8 +282,8 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
# Now do the \*(Aqdrover\*(Aq\&.
# IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag
\fB$ git cherry\-pick \-x aecb0b589f95d2efd6a32294cc6e6afb085f6b87\fR
[drover_9999 3f113b7] This change needs to go to branch 9999
\fB$ git cherry\-pick \-x 87e5c05985d9c2ee235c6b7b5d29cc50f45783db\fR
[drover_9999 5c879cc] This change needs to go to branch 9999
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
1 file changed, 1 insertion(+)
......@@ -292,7 +292,7 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
# That took the code authored by some\&.committer and committed it to
# the branch by the person who drovered it (i\&.e\&. you)\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
commit 3f113b79d87aadfbbc6d4ff8de038c69c94dc9b2
commit 5c879cc29a19045571b08d9b058b8306bf7dee6c
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: you <you@chromium\&.org>
......@@ -300,7 +300,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
This change needs to go to branch 9999
(cherry picked from commit aecb0b589f95d2efd6a32294cc6e6afb085f6b87)
(cherry picked from commit 87e5c05985d9c2ee235c6b7b5d29cc50f45783db)
# Looks good\&. Ship it!
\fB$ git cl upload\fR
......@@ -324,5 +324,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-footers
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-FOOTERS" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-FOOTERS" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -140,5 +140,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-freeze
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-FREEZE" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-FREEZE" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -60,7 +60,7 @@ D deleted_file
\fB$ git freeze\fR
\fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR
commit fd6fc0bda72f3f60055d8d5f7953862a9566794b
commit ba39366fbf53c9501a8649a09d82f7823d22ebd8
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -72,7 +72,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 \-
4 files changed, 2 insertions(+), 1 deletion(\-)
commit 092c50e807dbdadd0979a43e7ccc50cbfd6b4c98
commit 6071396fbc51599932099e642d49fd66db8abcb4
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -109,5 +109,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-hyper-blame
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-HYPER\-BLAME" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-HYPER\-BLAME" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -124,5 +124,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-map-branches
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-MAP\-BRANCHES" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-MAP\-BRANCHES" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -187,5 +187,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-map
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-MAP" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-MAP" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -175,5 +175,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-mark-merge-base
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-MARK\-MERGE\-BA" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-MARK\-MERGE\-BA" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -65,5 +65,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-nav-downstream
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -108,5 +108,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-nav-upstream
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-NAV\-UPSTREAM" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-NAV\-UPSTREAM" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -112,5 +112,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-new-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-NEW\-BRANCH" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-NEW\-BRANCH" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -164,5 +164,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-rebase-update
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-REBASE\-UPDATE" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-REBASE\-UPDATE" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -163,5 +163,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-rename-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-RENAME\-BRANCH" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-RENAME\-BRANCH" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -49,5 +49,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-reparent-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-REPARENT\-BRANC" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-REPARENT\-BRANC" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -89,5 +89,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-retry
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 09/02/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools ba1b0f3
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-RETRY" "1" "09/02/2016" "depot_tools ba1b0f3" "Chromium depot_tools Manual"
.TH "GIT\-RETRY" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
......@@ -2,12 +2,12 @@
.\" Title: git-squash-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-SQUASH\-BRANCH" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-SQUASH\-BRANCH" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,7 +37,7 @@ git-squash-branch \- Takes all commits in a single branch and replaces them with
.sp
.SH "DESCRIPTION"
.sp
git squash\-branch is a simple helper command\&. It takes all the commits on the current branch from the \fImerge_base\fR to HEAD, and reduces them to a single commit\&. The new commit will contain a summary of all the commits which were squashed, preceeded by a header message indicating that it\(cqs the result of a squash (or the message you pass on the command line\&.)\&.
git squash\-branch is a simple helper command\&. It takes all the commits on the current branch from the \fImerge_base\fR to HEAD, and reduces them to a single commit\&. The new commit will contain a summary of all the commits which were squashed, preceded by a header message indicating that it\(cqs the result of a squash (or the message you pass on the command line\&.)\&.
.sp
Squashing branches is useful when trying to rebase\-update over branches which were pushed to their upsteram (or committed by the \fICommit Queue\fR), and then conflicting changes landed in upstream on top of the push/commit\&. If you know that your branch was committed but \fBgit-rebase-update\fR(1) isn\(cqt able to automatically clean it, you can squash the troublesome branch before git rebase\-update, and then when git rebase\-update presents the conflict, you can verify that the conflict diff is what you expected (and then skip it with git rebase \-\-skip)\&.
.SH "OPTIONS"
......@@ -125,5 +125,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-thaw
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-THAW" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-THAW" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -50,5 +50,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: git-upstream-diff
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "GIT\-UPSTREAM\-DIFF" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "GIT\-UPSTREAM\-DIFF" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,7 +37,7 @@ git-upstream-diff \- Print a diff of the current branch, compared to its upstrea
.sp
.SH "DESCRIPTION"
.sp
Shows a diff beween your current branch and it\(cqs upstream\&. This is \fIroughly\fR the same as:
Shows a diff between your current branch and it\(cqs upstream\&. This is \fIroughly\fR the same as:
.sp
.if n \{\
.RS 4
......@@ -123,5 +123,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: depot_tools
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 07/21/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools bf2a341
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "DEPOT_TOOLS" "7" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS" "7" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -35,7 +35,7 @@ The Chromium depot_tools suite contains many tools to assist/augment the Chromiu
.sp
There are two primary categories of tools\&. Some of these tools are \fIessential\fR to the development flow, in the sense that you cannot successfully develop Chromium without them\&.
.sp
Other tools are merely \fIhelper\fR tools\&. Not required, but they can substantially ease the develpment workflow\&.
Other tools are merely \fIhelper\fR tools\&. Not required, but they can substantially ease the development workflow\&.
.sp
A listing of both categories of tools follows\&.
.SH "HELPER TOOLS"
......@@ -135,5 +135,5 @@ Print a diff of the current branch, compared to its upstream\&.
.IP " 1." 4
here
.RS 4
\%https://chromium.googlesource.com/chromium/tools/depot_tools
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
.RE
......@@ -2,12 +2,12 @@
.\" Title: depot_tools_tutorial
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 09/28/2016
.\" Date: 12/15/2016
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools daffbcf
.\" Source: depot_tools f72f1ad
.\" Language: English
.\"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "09/28/2016" "depot_tools daffbcf" "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
......@@ -17,7 +17,7 @@ to the development flow, in the sense that you cannot successfully develop
Chromium without them.
Other tools are merely 'helper' tools. Not required, but they can substantially
ease the develpment workflow.
ease the development workflow.
A listing of both categories of tools follows.
......
......@@ -4,7 +4,7 @@
add deleted_file
add unstaged_deleted_file
add modified_file
c 'I commited this and am proud of it.
c 'I committed this and am proud of it.
Cr-Commit-Position: refs/heads/master@{#292272}
Tech-Debt-Introduced: 17 microMSOffices
......
......@@ -17,7 +17,7 @@ DESCRIPTION
`git squash-branch` is a simple helper command. It takes all the commits on the
current branch from the 'merge_base' to HEAD, and reduces them to a single
commit. The new commit will contain a summary of all the commits which were
squashed, preceeded by a header message indicating that it's the result of a
squashed, preceded by a header message indicating that it's the result of a
squash (or the message you pass on the command line.).
Squashing branches is useful when trying to rebase-update over branches which
......
......@@ -14,7 +14,7 @@ SYNOPSIS
DESCRIPTION
-----------
Shows a diff beween your current branch and it's upstream. This is 'roughly' the
Shows a diff between your current branch and it's upstream. This is 'roughly' the
same as:
----
......
......@@ -25,7 +25,7 @@ case "$OS" in
i?86|x86_64)
LONG_BIT=$(getconf LONG_BIT)
# We know we are on x86 but we need to use getconf to determine
# bittage of the userspace install (e.g. when runing 32-bit userspace
# bittage of the userspace install (e.g. when running 32-bit userspace
# on x86_64 kernel)
exec "${THIS_DIR}/ninja-linux${LONG_BIT}" "$@";;
*)
......
......@@ -3,7 +3,7 @@
# found in the LICENSE file.
"""Recipe module to ensure a checkout is consistant on a bot."""
"""Recipe module to ensure a checkout is consistent on a bot."""
from recipe_engine import recipe_api
......
......@@ -55,7 +55,7 @@ class GSUtilApi(recipe_api.RecipeApi):
if use_retry_wrapper:
# The -- argument for the wrapped gsutil.py is escaped as ---- as python
# 2.7.3 removes all occurences of --, not only the first. It is unescaped
# 2.7.3 removes all occurrences of --, not only the first. It is unescaped
# in gsutil_wrapper.py and then passed as -- to gsutil.py.
# Note, that 2.7.6 doesn't have this problem, but it doesn't hurt.
cmd_prefix.append('----')
......
......@@ -34,7 +34,7 @@ def main(argv):
args = parser.parse_args()
# The -- argument for the wrapped gsutil.py is escaped as ---- as python
# 2.7.3 removes all occurences of --, not only the first.
# 2.7.3 removes all occurrences of --, not only the first.
if '----' in args.command:
args.command[args.command.index('----')] = '--'
......
......@@ -350,7 +350,7 @@ class S2Test(BaseTestCase):
- CR output with universal_newlines=True
- CRLF output with universal_newlines=True
First |function| argument is the convertion for the origianl expected LF
First |function| argument is the conversion for the origianl expected LF
string to the right EOL.
Second |function| argument is the executable and initial flag to run, to
control what EOL is used by the child process.
......
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