[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 89d90d49f3 1/2: manual: A little copy-editing
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit 89d90d49f3 1/2: manual: A little copy-editing |
Date: |
Tue, 6 Jun 2023 13:02:22 -0400 (EDT) |
branch: elpa/git-commit
commit 89d90d49f380b3e6e3d5989dc3c61ef2a91806d6
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
manual: A little copy-editing
---
docs/magit.org | 13 ++++++-------
docs/magit.texi | 13 ++++++-------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/docs/magit.org b/docs/magit.org
index 8fe7300b71..76e3b941f0 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -9042,21 +9042,20 @@ tag signing", then you'll also need to synchronize
~$GPG_AGENT_INFO~.
*** Expanding a file to show the diff causes it to disappear
-This is probably caused by a change of a ~diff.*~ Git variable. You
-probably set that variable for a reason, and should therefore
-only undo that setting in Magit by customizing
-~magit-git-global-arguments~.
+This is probably caused by a customization of a ~diff.*~ Git variable.
+You probably set that variable for a reason, and should therefore only
+undo that setting in Magit by customizing ~magit-git-global-arguments~.
*** Point is wrong in the ~COMMIT_EDITMSG~ buffer
Neither Magit nor `git-commit` fiddle with point in the buffer used to
write commit messages, so something else must be doing it.
-You have probably globally enabled a mode which does restore point in
+You have probably globally enabled a mode which restores point in
file-visiting buffers. It might be a bit surprising, but when you
write a commit message, then you are actually editing a file.
-So you have to figure out which package is doing. ~saveplace~,
+So you have to figure out which package is doing it. ~saveplace~,
~pointback~, and ~session~ are likely candidates. These snippets might
help:
@@ -9102,7 +9101,7 @@ the names remain unique when those prefixes are
stripped). We
consider ambiguous refnames unsupported and recommend that you use a
non-ambiguous naming scheme. However, if you do work with a
repository that has ambiguous refnames, please report any issues you
-encounter so that we can investigate whether there is a simple fix.
+encounter, so that we can investigate whether there is a simple fix.
*** My Git hooks work on the command-line but not inside Magit
diff --git a/docs/magit.texi b/docs/magit.texi
index 71a2f92167..175b1066ed 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -11122,10 +11122,9 @@ tag signing", then you'll also need to synchronize
@code{$GPG_AGENT_INFO}.
@node Expanding a file to show the diff causes it to disappear
@appendixsubsec Expanding a file to show the diff causes it to disappear
-This is probably caused by a change of a @code{diff.*} Git variable. You
-probably set that variable for a reason, and should therefore
-only undo that setting in Magit by customizing
-@code{magit-git-global-arguments}.
+This is probably caused by a customization of a @code{diff.*} Git variable.
+You probably set that variable for a reason, and should therefore only
+undo that setting in Magit by customizing @code{magit-git-global-arguments}.
@node Point is wrong in the @code{COMMIT_EDITMSG} buffer
@appendixsubsec Point is wrong in the @code{COMMIT_EDITMSG} buffer
@@ -11133,11 +11132,11 @@ only undo that setting in Magit by customizing
Neither Magit nor `git-commit` fiddle with point in the buffer used to
write commit messages, so something else must be doing it.
-You have probably globally enabled a mode which does restore point in
+You have probably globally enabled a mode which restores point in
file-visiting buffers. It might be a bit surprising, but when you
write a commit message, then you are actually editing a file.
-So you have to figure out which package is doing. @code{saveplace},
+So you have to figure out which package is doing it. @code{saveplace},
@code{pointback}, and @code{session} are likely candidates. These snippets
might
help:
@@ -11185,7 +11184,7 @@ the names remain unique when those prefixes are
stripped). We
consider ambiguous refnames unsupported and recommend that you use a
non-ambiguous naming scheme. However, if you do work with a
repository that has ambiguous refnames, please report any issues you
-encounter so that we can investigate whether there is a simple fix.
+encounter, so that we can investigate whether there is a simple fix.
@node My Git hooks work on the command-line but not inside Magit
@appendixsubsec My Git hooks work on the command-line but not inside Magit