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: Aaron Gable <agable@chromium.org>
@ -858,7 +858,7 @@ at least once to fetch the branches.</p></div>
<h4id="_merge_example">Merge Example</h4>
<divclass="paragraph"><p></p></div><divclass="listingblock"><divclass="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
@ -888,7 +888,7 @@ About to land on 9999. Continue (y/n)? y
<h4id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
<divclass="paragraph"><p></p></div><divclass="listingblock"><divclass="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
@ -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
@ -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\&.
Quinten Yearsley
9 years ago
committed by
Commit Bot