Pure typo fixes, no semantic change.
- RelNotes/2.49.1.adoc: "updates to to Fedora base image" -> "updates to Fedora base image" - RelNotes/2.49.0.adoc: "which turns out that that the object" -> "which turns out that the object" - howto/revert-branch-rebase.adoc: "I happen to know that that merge" -> "I happen to know that the merge" - config/bitmap-pseudo-merge.adoc: "psuedo-merge" -> "pseudo-merge" - technical/bitmap-format.adoc: "included in the this psuedo-merge" -> "included in this pseudo-merge"
Signed-off-by: Clinton Phillips <clintdotphillips@gmail.com> --- Documentation/RelNotes/2.49.0.adoc | 2 +- Documentation/RelNotes/2.49.1.adoc | 2 +- Documentation/config/bitmap-pseudo-merge.adoc | 2 +- Documentation/howto/revert-branch-rebase.adoc | 2 +- Documentation/technical/bitmap-format.adoc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
Show changes to 5 files +5 −5
Documentation/RelNotes/2.49.0.adoc, Documentation/RelNotes/2.49.1.adoc, Documentation/config/bitmap-pseudo-merge.adoc, Documentation/howto/revert-branch-rebase.adoc, Documentation/technical/bitmap-format.adoc
diff --git a/Documentation/RelNotes/2.49.0.adoc b/Documentation/RelNotes/2.49.0.adoc index 494c8309..35684515 100644 --- a/Documentation/RelNotes/2.49.0.adoc +++ b/Documentation/RelNotes/2.49.0.adoc @@ -118,7 +118,7 @@ Fixes since v2.48 placeholder signal (e.g. "--option=<value>"). (merge 5b34dd08d0 as/long-option-help-i18n later to maint). - * CI jobs gave sporadic failures, which turns out that that the + * CI jobs gave sporadic failures, which turns out that the object finalization code was giving an error when it did not have to. (merge d7fcbe2c56 ps/object-collision-check later to maint). diff --git a/Documentation/RelNotes/2.49.1.adoc b/Documentation/RelNotes/2.49.1.adoc index c619e8b4..697f0f22 100644 --- a/Documentation/RelNotes/2.49.1.adoc +++ b/Documentation/RelNotes/2.49.1.adoc @@ -9,4 +9,4 @@ notes for v2.43.7 for details. It also contains some updates to various CI bits to work around and/or to adjust to the deprecation of use of Ubuntu 20.04 GitHub -Actions CI, updates to to Fedora base image. +Actions CI, updates to Fedora base image. diff --git a/Documentation/config/bitmap-pseudo-merge.adoc b/Documentation/config/bitmap-pseudo-merge.adoc index 1f264eca..a0604a41 100644 --- a/Documentation/config/bitmap-pseudo-merge.adoc +++ b/Documentation/config/bitmap-pseudo-merge.adoc @@ -88,4 +88,4 @@ more useful). bitmapPseudoMerge.<name>.stableSize:: Determines the size (in number of commits) of a stable - psuedo-merge bitmap. The default is `512`. + pseudo-merge bitmap. The default is `512`. diff --git a/Documentation/howto/revert-branch-rebase.adoc b/Documentation/howto/revert-branch-rebase.adoc index a3e5595a..d56dde64 100644 --- a/Documentation/howto/revert-branch-rebase.adoc +++ b/Documentation/howto/revert-branch-rebase.adoc @@ -27,7 +27,7 @@ $ git checkout -b revert-c99 master Now I am on the 'revert-c99' branch. Let's figure out which commit to revert. I happen to know that the top of the 'master' branch is a merge, and its second parent (i.e. foreign commit I merged from) has -the change I would want to undo. Further I happen to know that that +the change I would want to undo. Further I happen to know that the merge introduced 5 commits or so: ------------------------------------------------ diff --git a/Documentation/technical/bitmap-format.adoc b/Documentation/technical/bitmap-format.adoc index bfb0ec7b..59859c80 100644 --- a/Documentation/technical/bitmap-format.adoc +++ b/Documentation/technical/bitmap-format.adoc @@ -338,7 +338,7 @@ the end of a `.bitmap` file. The format is as follows: * One or more pseudo-merge bitmaps, each containing: ** `commits_bitmap`, an EWAH-compressed bitmap describing the set of - commits included in the this psuedo-merge. + commits included in this pseudo-merge. ** `merge_bitmap`, an EWAH-compressed bitmap describing the union of the set of objects reachable from all commits listed in the
-- 2.49.0