branch: elpa/magit
commit c3d614b0d509129d0c4b486f471a4ca26f31a8b2
Author: Kyle Meyer <[email protected]>
Commit: Kyle Meyer <[email protected]>
Fix typos
---
docs/CHANGELOG.4 | 2 +-
lisp/magit-extras.el | 4 ++--
lisp/magit-log.el | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/CHANGELOG.4 b/docs/CHANGELOG.4
index 558f488d81..8c7215ba8b 100644
--- a/docs/CHANGELOG.4
+++ b/docs/CHANGELOG.4
@@ -48,7 +48,7 @@
~magit-submodule-list~ to support unpopulated modules. #5077
- When ~magit-bisect-start~ and ~magit-bisect-run~ are invoked with the
- region marking a reange of consecutive commit, the commits at the
+ region marking a range of consecutive commit, the commits at the
ends are used as the good and bad commits. #5049
- ~magit-branch-checkout~ now always passes the commit, which is to be
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 19d6dce117..202919495d 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -212,7 +212,7 @@ Also see `magit-project-dispatch'."
Note that for `magit-dispatch' to operate in the selected project,
the current buffer's `default-directory' must be located in the
-selected repository. To achive that, a Dired buffer is created.
+selected repository. To achieve that, a Dired buffer is created.
To teach `project-switch-project' about this command, you have to
add something like this to your configuration:
@@ -846,7 +846,7 @@ the result. That cache can be invalidated using
`magit-zap-caches'.
Note that \"find\" will be run once in every repository, including in
huge repositories, which don't actually have any nested repositories.
This may be highly inefficient and you might have to implement your own
-version of this function, which is more suited to you situation. This
+version of this function, which is more suited to your situation. This
function is mostly intended as a proof-of-concept."
(unless (magit-list-module-names)
(unless (magit-repository-local-exists-p 'nested-repos)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 5d40a36d97..945546d064 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -157,10 +157,10 @@ This is useful if you use really long branch names."
#'magit-highlight-bracket-keywords)
"Functions used to highlight parts of each individual commit summary.
-These functions are called in order, in a buffer that containing the
-first line of the commit message. They should set text properties as
-they see fit, usually just `font-lock-face'. Before each function is
-called, point is at the beginning of the buffer.
+These functions are called in order, in a buffer containing the first
+line of the commit message. They should set text properties as they see
+fit, usually just `font-lock-face'. Before each function is called,
+point is at the beginning of the buffer.
See also the related `magit-revision-wash-message-hook'. You likely
want to use the same functions for both hooks."
@@ -470,7 +470,7 @@ commits before and half after."
(transient-define-group magit-log-infix-arguments
;; The grouping in git-log(1) appears to be guided by implementation
- ;; details, so our logical grouping only follows it to an extend.
+ ;; details, so our logical grouping only follows it to an extent.
;; Arguments that are "misplaced" here:
;; 1. From "Commit Formatting".
;; 2. From "Common Diff Options". ;FIXME
