branch: elpa/git-commit commit 5bcb8c7d9752724e6ed7f57fb14d47aaa52077f0 Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
Fix documentation typos --- docs/magit.org | 2 +- docs/magit.texi | 2 +- lisp/magit-base.el | 2 +- lisp/magit-log.el | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/magit.org b/docs/magit.org index b5f489903b..3c659f7f3e 100644 --- a/docs/magit.org +++ b/docs/magit.org @@ -5884,7 +5884,7 @@ shown in different colors to indicate the status of the commits. The following colors are used: -- Commits that use the same forground color as the ~default~ face have +- Commits that use the same foreground color as the ~default~ face have not been applied yet. - Yellow commits have some special relationship to the commit rebase diff --git a/docs/magit.texi b/docs/magit.texi index 779e02d88e..ba584e61da 100644 --- a/docs/magit.texi +++ b/docs/magit.texi @@ -7239,7 +7239,7 @@ The following colors are used: @itemize @item -Commits that use the same forground color as the @code{default} face have +Commits that use the same foreground color as the @code{default} face have not been applied yet. @item diff --git a/lisp/magit-base.el b/lisp/magit-base.el index 289982ddd2..cb9ad67309 100644 --- a/lisp/magit-base.el +++ b/lisp/magit-base.el @@ -674,7 +674,7 @@ third-party completion frameworks." (advice-member-p 'consult-completing-read-multiple 'completing-read-multiple)) ;; Our NO-SPLIT hack is not compatible with `CONSULT's - ;; implemenation so fall back to the original function. + ;; implementation so fall back to the original function. ;; #4437 (unwind-protect (progn diff --git a/lisp/magit-log.el b/lisp/magit-log.el index 4328a56b8a..47c3fb6baf 100644 --- a/lisp/magit-log.el +++ b/lisp/magit-log.el @@ -1775,7 +1775,7 @@ keymap is the parent of their keymaps.") (cl-defmethod magit-section-ident-value ((section magit-unpulled-section)) "\"..@{push}\" cannot be used as the value because that is -ambigious if `push.default' does not allow a 1:1 mapping, and +ambiguous if `push.default' does not allow a 1:1 mapping, and many commands would fail because of that. But here that does not matter and we need an unique value so we use that string in the pushremote case." @@ -1820,7 +1820,7 @@ in the pushremote case." (cl-defmethod magit-section-ident-value ((section magit-unpushed-section)) "\"..@{push}\" cannot be used as the value because that is -ambigious if `push.default' does not allow a 1:1 mapping, and +ambiguous if `push.default' does not allow a 1:1 mapping, and many commands would fail because of that. But here that does not matter and we need an unique value so we use that string in the pushremote case."