From 442fb64cab695a5fabec8ba32b1b733acd5b8ef8 Mon Sep 17 00:00:00 2001 From: Quinten Yearsley Date: Thu, 15 Dec 2016 15:38:27 -0800 Subject: [PATCH] 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 Reviewed-by: Aaron Gable --- README.md | 2 +- bootstrap/win/README.md | 2 +- git_cl.py | 4 +- man/html/depot_tools.html | 6 +-- man/html/depot_tools_tutorial.html | 2 +- man/html/git-cherry-pick-upload.html | 4 +- man/html/git-drover.html | 34 ++++++++--------- man/html/git-footers.html | 4 +- man/html/git-freeze.html | 8 ++-- man/html/git-hyper-blame.html | 4 +- man/html/git-map-branches.html | 4 +- man/html/git-map.html | 4 +- man/html/git-mark-merge-base.html | 4 +- man/html/git-nav-downstream.html | 4 +- man/html/git-nav-upstream.html | 4 +- man/html/git-new-branch.html | 4 +- man/html/git-rebase-update.html | 4 +- man/html/git-rename-branch.html | 4 +- man/html/git-reparent-branch.html | 4 +- man/html/git-retry.html | 2 +- man/html/git-squash-branch.html | 6 +-- man/html/git-thaw.html | 4 +- man/html/git-upstream-diff.html | 6 +-- man/man1/git-cherry-pick-upload.1 | 8 ++-- man/man1/git-drover.1 | 38 +++++++++---------- man/man1/git-footers.1 | 8 ++-- man/man1/git-freeze.1 | 12 +++--- man/man1/git-hyper-blame.1 | 8 ++-- man/man1/git-map-branches.1 | 8 ++-- man/man1/git-map.1 | 8 ++-- man/man1/git-mark-merge-base.1 | 8 ++-- man/man1/git-nav-downstream.1 | 8 ++-- man/man1/git-nav-upstream.1 | 8 ++-- man/man1/git-new-branch.1 | 8 ++-- man/man1/git-rebase-update.1 | 8 ++-- man/man1/git-rename-branch.1 | 8 ++-- man/man1/git-reparent-branch.1 | 8 ++-- man/man1/git-retry.1 | 6 +-- man/man1/git-squash-branch.1 | 10 ++--- man/man1/git-thaw.1 | 8 ++-- man/man1/git-upstream-diff.1 | 10 ++--- man/man7/depot_tools.7 | 10 ++--- man/man7/depot_tools_tutorial.7 | 6 +-- man/src/depot_tools.txt | 2 +- man/src/git-footers.demo.1.sh | 2 +- man/src/git-squash-branch.txt | 2 +- man/src/git-upstream-diff.txt | 2 +- ninja | 2 +- recipe_modules/bot_update/api.py | 2 +- recipe_modules/gsutil/api.py | 2 +- .../gsutil/resources/gsutil_smart_retry.py | 2 +- tests/subprocess2_test.py | 2 +- 52 files changed, 169 insertions(+), 169 deletions(-) diff --git a/README.md b/README.md index 5490262f3e..d8cbc89f56 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/bootstrap/win/README.md b/bootstrap/win/README.md index f4f382aa12..1f26b5e2ec 100644 --- a/bootstrap/win/README.md +++ b/bootstrap/win/README.md @@ -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` diff --git a/git_cl.py b/git_cl.py index 23f8d48923..7d915927a0 100755 --- a/git_cl.py +++ b/git_cl.py @@ -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 diff --git a/man/html/depot_tools.html b/man/html/depot_tools.html index e00cf4c3d8..4c638dad5c 100644 --- a/man/html/depot_tools.html +++ b/man/html/depot_tools.html @@ -756,12 +756,12 @@ depot_tools(7) Manual Page

The Chromium depot_tools suite contains many tools to assist/augment the Chromium development environment. The tools may be downloaded from -here.

+here.

There are two primary categories of tools. Some of these tools are essential 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.

@@ -927,7 +927,7 @@ Print a diff of the current branch, compared to its upstream.
diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index 0d23f6a658..4ca80473c8 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -1580,7 +1580,7 @@ from
diff --git a/man/html/git-cherry-pick-upload.html b/man/html/git-cherry-pick-upload.html index 2ac9e8a940..bc3896eeff 100644 --- a/man/html/git-cherry-pick-upload.html +++ b/man/html/git-cherry-pick-upload.html @@ -801,14 +801,14 @@ Finalizing upload: OK

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-drover.html b/man/html/git-drover.html index 1827fe224e..dcac4ac08a 100644 --- a/man/html/git-drover.html +++ b/man/html/git-drover.html @@ -858,7 +858,7 @@ at least once to fetch the branches.

Merge Example

# Here's a commit (from some.committer) that we want to 'drover'.
 $ git log -n 1 --pretty=fuller
-commit f1b2947cd99ad36614e71a51a925a6dae060fecd
+commit 3b3f7e1631a521457357228c2048e647c60e67bd
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer <some.committer@chromium.org>
@@ -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'.
-$ git drover --branch 9999 --cherry-pick f1b2947cd99ad36614e71a51a925a6dae060fecd
+$ git drover --branch 9999 --cherry-pick 3b3f7e1631a521457357228c2048e647c60e67bd
 Going to cherry-pick
 """
-commit f1b2947cd99ad36614e71a51a925a6dae060fecd
+commit 3b3f7e1631a521457357228c2048e647c60e67bd
 Author: some.committer <some.committer@chromium.org>
 Date:   Thu Apr 10 08:54:46 2014 +0000
 
@@ -888,7 +888,7 @@ About to land on 9999. Continue (y/n)? y
 
Merge with Conflicts Example

 
# Here's a commit (from some.committer) that we want to 'drover'.
 $ git log -n 1 --pretty=fuller
-commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77
+commit 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer <some.committer@chromium.org>
@@ -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'.
-$ git drover --branch 9999 --cherry-pick 78d5e1beb49c2bfa0369a2712dd1b4a502805a77
+$ git drover --branch 9999 --cherry-pick 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662
 Going to cherry-pick
 """
-commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77
+commit 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662
 Author: some.committer <some.committer@chromium.org>
 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.
 $ git log -n 1
-commit d281ba6029d6bff1368a5885be8e2c638e1bfe73
+commit 302334dbd2dca060814ffd3567808f2beafbf647
 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.
-$ git revert d281ba6029d6bff1368a5885be8e2c638e1bfe73
+$ git revert 302334dbd2dca060814ffd3567808f2beafbf647
 
 # That reverted the change and committed the revert.
 $ git log -n 1
-commit 7eb05d0f8e79ef563684500dc38d0dee069f7dc6
+commit dd4742441d71cf2b8f403ff9ca819b3201de3c5b
 Author: you <you@chromium.org>
 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.
 $ git cl upload -r some.committer@chromium.org --send-mail
@@ -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'.
 $ git log -n 1 --pretty=fuller
-commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422
+commit 441c947b3ff6e1d6b9036d67926011fbea92724f
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer <some.committer@chromium.org>
@@ -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
-$ git cherry-pick -x b9199aa1ab7d60a1e127de8c46c0983d13f2c422
-[drover_9999 729161e] This change needs to go to branch 9999
+$ git cherry-pick -x 441c947b3ff6e1d6b9036d67926011fbea92724f
+[drover_9999 c7b0d40] 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(+)
@@ -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).
 $ git log -n 1 --pretty=fuller
-commit 729161e36af15142cdf591021de71e70e0db1ea2
+commit c7b0d40c9f5793a27043688183a48597e656adcc
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     you <you@chromium.org>
@@ -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!
 $ git cl upload
@@ -1030,14 +1030,14 @@ Using 50% similarity for rename/copy detection. Override with --similarity.
 

 
Part of the chromium depot_tools(7) suite. These tools are meant to
 assist with the development of chromium and related projects. Download the tools
-from here.

+from here.
diff --git a/man/html/git-footers.html b/man/html/git-footers.html index 76e6020e1f..b16d3b991e 100644 --- a/man/html/git-footers.html +++ b/man/html/git-footers.html @@ -864,14 +864,14 @@ refs/heads/master

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-freeze.html b/man/html/git-freeze.html index 1fe6078775..290e9aa0a3 100644 --- a/man/html/git-freeze.html +++ b/man/html/git-freeze.html @@ -790,7 +790,7 @@ time you ran git freeze (freshly modified files, new files, etc.).

$ git freeze $ git status --short $ git log -n 2 --stat -commit 42c38320f46c6bc9a8aba7f15b41971e5f1db75b +commit c819cf561064339cde3dff88311c4fa63ce35d5c Author: local <local@chromium.org> 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 - 4 files changed, 2 insertions(+), 1 deletion(-) -commit 5e0079a0fd55960682c389e71e0283594a80c02b +commit 5ab592982f141dd6857ee2ddd4aa5b97e2c13746 Author: local <local@chromium.org> Date: Thu Apr 10 08:54:56 2014 +0000 @@ -845,14 +845,14 @@ limit disables the size-limit check entirely. 100 by default.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-hyper-blame.html b/man/html/git-hyper-blame.html index 2daa63e936..fedb29fae8 100644 --- a/man/html/git-hyper-blame.html +++ b/man/html/git-hyper-blame.html @@ -864,14 +864,14 @@ other more invasive changes.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-map-branches.html b/man/html/git-map-branches.html index c208d32322..936cc65d10 100644 --- a/man/html/git-map-branches.html +++ b/man/html/git-map-branches.html @@ -858,14 +858,14 @@ file.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-map.html b/man/html/git-map.html index 91e24bb539..68abb4e1c3 100644 --- a/man/html/git-map.html +++ b/man/html/git-map.html @@ -873,14 +873,14 @@ branch), use the git-map-branches(1) command

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-mark-merge-base.html b/man/html/git-mark-merge-base.html index 47e74283bf..212b6f6f54 100644 --- a/man/html/git-mark-merge-base.html +++ b/man/html/git-mark-merge-base.html @@ -812,14 +812,14 @@ configuration variable for more info on what the merge base markers are for.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-nav-downstream.html b/man/html/git-nav-downstream.html index 27ca30b5bf..1820b3418d 100644 --- a/man/html/git-nav-downstream.html +++ b/man/html/git-nav-downstream.html @@ -830,14 +830,14 @@ file.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-nav-upstream.html b/man/html/git-nav-upstream.html index ebc84dd515..9068a0bc19 100644 --- a/man/html/git-nav-upstream.html +++ b/man/html/git-nav-upstream.html @@ -833,14 +833,14 @@ file.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-new-branch.html b/man/html/git-new-branch.html index 965e9c824b..369d8190a3 100644 --- a/man/html/git-new-branch.html +++ b/man/html/git-new-branch.html @@ -910,14 +910,14 @@ mnemonic: tb → "track branch"

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-rebase-update.html b/man/html/git-rebase-update.html index 0d857ac616..84eebeea86 100644 --- a/man/html/git-rebase-update.html +++ b/man/html/git-rebase-update.html @@ -928,14 +928,14 @@ file.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-rename-branch.html b/man/html/git-rename-branch.html index 0d1b0e422d..62b42fb613 100644 --- a/man/html/git-rename-branch.html +++ b/man/html/git-rename-branch.html @@ -780,14 +780,14 @@ tracking information to preserve inter-branch dependencies.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-reparent-branch.html b/man/html/git-reparent-branch.html index e9482c956b..91410d45c1 100644 --- a/man/html/git-reparent-branch.html +++ b/man/html/git-reparent-branch.html @@ -833,14 +833,14 @@ file.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-retry.html b/man/html/git-retry.html index 3a13a1fdcb..4051be7144 100644 --- a/man/html/git-retry.html +++ b/man/html/git-retry.html @@ -851,7 +851,7 @@ from
diff --git a/man/html/git-squash-branch.html b/man/html/git-squash-branch.html index fa341577c1..ef8b33a7fe 100644 --- a/man/html/git-squash-branch.html +++ b/man/html/git-squash-branch.html @@ -766,7 +766,7 @@ git-squash-branch(1) Manual Page

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 were pushed to their upsteram (or committed by the Commit Queue), and then @@ -867,14 +867,14 @@ file.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-thaw.html b/man/html/git-thaw.html index 1cfe42454e..bd1367b5fb 100644 --- a/man/html/git-thaw.html +++ b/man/html/git-thaw.html @@ -780,14 +780,14 @@ freeze), git thaw will thaw all of the freezes.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/html/git-upstream-diff.html b/man/html/git-upstream-diff.html index 4621e86320..1c15adb7ac 100644 --- a/man/html/git-upstream-diff.html +++ b/man/html/git-upstream-diff.html @@ -763,7 +763,7 @@ git-upstream-diff(1) Manual Page

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:

@@ -884,14 +884,14 @@ file.

Part of the chromium depot_tools(7) suite. These tools are meant to assist with the development of chromium and related projects. Download the tools -from here.

+from here.

diff --git a/man/man1/git-cherry-pick-upload.1 b/man/man1/git-cherry-pick-upload.1 index 984b923fd3..6ac45aad07 100644 --- a/man/man1/git-cherry-pick-upload.1 +++ b/man/man1/git-cherry-pick-upload.1 @@ -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 -.\" 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 diff --git a/man/man1/git-drover.1 b/man/man1/git-drover.1 index 15fa320713..f491ef2ea1 100644 --- a/man/man1/git-drover.1 +++ b/man/man1/git-drover.1 @@ -2,12 +2,12 @@ .\" Title: git-drover .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -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 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 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -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 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 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 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 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -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 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 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: you @@ -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 diff --git a/man/man1/git-footers.1 b/man/man1/git-footers.1 index b708ea504f..69172004f5 100644 --- a/man/man1/git-footers.1 +++ b/man/man1/git-footers.1 @@ -2,12 +2,12 @@ .\" Title: git-footers .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 diff --git a/man/man1/git-freeze.1 b/man/man1/git-freeze.1 index 809df1b88f..08c99f480c 100644 --- a/man/man1/git-freeze.1 +++ b/man/man1/git-freeze.1 @@ -2,12 +2,12 @@ .\" Title: git-freeze .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 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 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 diff --git a/man/man1/git-hyper-blame.1 b/man/man1/git-hyper-blame.1 index 169eeda676..fa27c0ad06 100644 --- a/man/man1/git-hyper-blame.1 +++ b/man/man1/git-hyper-blame.1 @@ -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 -.\" 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 diff --git a/man/man1/git-map-branches.1 b/man/man1/git-map-branches.1 index 246f4869b9..8b4dcb13e0 100644 --- a/man/man1/git-map-branches.1 +++ b/man/man1/git-map-branches.1 @@ -2,12 +2,12 @@ .\" Title: git-map-branches .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 diff --git a/man/man1/git-map.1 b/man/man1/git-map.1 index bab0f29560..d853bd6930 100644 --- a/man/man1/git-map.1 +++ b/man/man1/git-map.1 @@ -2,12 +2,12 @@ .\" Title: git-map .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 diff --git a/man/man1/git-mark-merge-base.1 b/man/man1/git-mark-merge-base.1 index f80ec208e9..9fc01fb64d 100644 --- a/man/man1/git-mark-merge-base.1 +++ b/man/man1/git-mark-merge-base.1 @@ -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 -.\" 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 diff --git a/man/man1/git-nav-downstream.1 b/man/man1/git-nav-downstream.1 index c81c86a41f..03398b3c52 100644 --- a/man/man1/git-nav-downstream.1 +++ b/man/man1/git-nav-downstream.1 @@ -2,12 +2,12 @@ .\" Title: git-nav-downstream .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 diff --git a/man/man1/git-nav-upstream.1 b/man/man1/git-nav-upstream.1 index 989bd3af2f..ac8eb83514 100644 --- a/man/man1/git-nav-upstream.1 +++ b/man/man1/git-nav-upstream.1 @@ -2,12 +2,12 @@ .\" Title: git-nav-upstream .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 diff --git a/man/man1/git-new-branch.1 b/man/man1/git-new-branch.1 index a0e8401cfa..a2f2e10d59 100644 --- a/man/man1/git-new-branch.1 +++ b/man/man1/git-new-branch.1 @@ -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 -.\" 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 diff --git a/man/man1/git-rebase-update.1 b/man/man1/git-rebase-update.1 index 0223270288..ef349c566d 100644 --- a/man/man1/git-rebase-update.1 +++ b/man/man1/git-rebase-update.1 @@ -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 -.\" 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 diff --git a/man/man1/git-rename-branch.1 b/man/man1/git-rename-branch.1 index f7efa3a3a9..5fea969826 100644 --- a/man/man1/git-rename-branch.1 +++ b/man/man1/git-rename-branch.1 @@ -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 -.\" 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 diff --git a/man/man1/git-reparent-branch.1 b/man/man1/git-reparent-branch.1 index 44ef895fce..a6050ecd0c 100644 --- a/man/man1/git-reparent-branch.1 +++ b/man/man1/git-reparent-branch.1 @@ -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 -.\" 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 diff --git a/man/man1/git-retry.1 b/man/man1/git-retry.1 index a904f162d3..f0cfb6eaa2 100644 --- a/man/man1/git-retry.1 +++ b/man/man1/git-retry.1 @@ -2,12 +2,12 @@ .\" Title: git-retry .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-squash-branch.1 b/man/man1/git-squash-branch.1 index e6b55f0c8e..be14afe25c 100644 --- a/man/man1/git-squash-branch.1 +++ b/man/man1/git-squash-branch.1 @@ -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 -.\" 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 diff --git a/man/man1/git-thaw.1 b/man/man1/git-thaw.1 index 9a6d53bf45..2ae7443fb9 100644 --- a/man/man1/git-thaw.1 +++ b/man/man1/git-thaw.1 @@ -2,12 +2,12 @@ .\" Title: git-thaw .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 diff --git a/man/man1/git-upstream-diff.1 b/man/man1/git-upstream-diff.1 index 5bb99f6d7c..44621c8e7e 100644 --- a/man/man1/git-upstream-diff.1 +++ b/man/man1/git-upstream-diff.1 @@ -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 -.\" 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 diff --git a/man/man7/depot_tools.7 b/man/man7/depot_tools.7 index 4826df80af..a67c986232 100644 --- a/man/man7/depot_tools.7 +++ b/man/man7/depot_tools.7 @@ -2,12 +2,12 @@ .\" Title: depot_tools .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" 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 diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7 index d00fe3c947..4ea641b6d0 100644 --- a/man/man7/depot_tools_tutorial.7 +++ b/man/man7/depot_tools_tutorial.7 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/src/depot_tools.txt b/man/src/depot_tools.txt index b25052e996..61ebd91ada 100644 --- a/man/src/depot_tools.txt +++ b/man/src/depot_tools.txt @@ -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. diff --git a/man/src/git-footers.demo.1.sh b/man/src/git-footers.demo.1.sh index 6825857cd9..fb596b975a 100755 --- a/man/src/git-footers.demo.1.sh +++ b/man/src/git-footers.demo.1.sh @@ -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 diff --git a/man/src/git-squash-branch.txt b/man/src/git-squash-branch.txt index fe7850c593..0017d92ab9 100644 --- a/man/src/git-squash-branch.txt +++ b/man/src/git-squash-branch.txt @@ -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 diff --git a/man/src/git-upstream-diff.txt b/man/src/git-upstream-diff.txt index 31d8c0b7ea..d9d976722c 100644 --- a/man/src/git-upstream-diff.txt +++ b/man/src/git-upstream-diff.txt @@ -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: ---- diff --git a/ninja b/ninja index a946324580..282cc27687 100755 --- a/ninja +++ b/ninja @@ -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}" "$@";; *) diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py index 653989b3a4..a233f9f309 100644 --- a/recipe_modules/bot_update/api.py +++ b/recipe_modules/bot_update/api.py @@ -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 diff --git a/recipe_modules/gsutil/api.py b/recipe_modules/gsutil/api.py index dd7e357cbe..bdae5f5ed7 100644 --- a/recipe_modules/gsutil/api.py +++ b/recipe_modules/gsutil/api.py @@ -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('----') diff --git a/recipe_modules/gsutil/resources/gsutil_smart_retry.py b/recipe_modules/gsutil/resources/gsutil_smart_retry.py index ebc8cb48ee..ed5794e411 100755 --- a/recipe_modules/gsutil/resources/gsutil_smart_retry.py +++ b/recipe_modules/gsutil/resources/gsutil_smart_retry.py @@ -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('----')] = '--' diff --git a/tests/subprocess2_test.py b/tests/subprocess2_test.py index e7ddf90947..0160ad0a90 100755 --- a/tests/subprocess2_test.py +++ b/tests/subprocess2_test.py @@ -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.