emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/magit 98667fa8b2 21/28: magit-stash-{pop, apply}: Copy edi


From: Jonas Bernoulli
Subject: [nongnu] elpa/magit 98667fa8b2 21/28: magit-stash-{pop, apply}: Copy edit documentation
Date: Fri, 6 Dec 2024 17:17:05 -0500 (EST)

branch: elpa/magit
commit 98667fa8b2ee051e967e1929db648777166b905c
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-stash-{pop,apply}: Copy edit documentation
---
 docs/magit.org      | 4 ++--
 docs/magit.texi     | 4 ++--
 lisp/magit-stash.el | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index 4790f564c8..14fdc7f9b5 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -6427,7 +6427,7 @@ Also see [[man:git-stash]]
   the index stored in the stash, if any.  This may fail because
   applying the stash could result in conflicts and those have to
   be stored in the index, making it impossible to also store the
-  stash's index there as well.
+  stash's index there.
 
   If the above failed, then try ~git stash apply~.  This fails
   (with or without ~--index~) if there are any uncommitted
@@ -6452,7 +6452,7 @@ Also see [[man:git-stash]]
   the index stored in the stash, if any.  This may fail because
   applying the stash could result in conflicts and those have to
   be stored in the index, making it impossible to also store the
-  stash's index there as well.
+  stash's index there.
 
   If the above failed, then try ~git stash apply~.  This fails
   (with or without ~--index~) if there are any uncommitted
diff --git a/docs/magit.texi b/docs/magit.texi
index a0fbf29e68..f00d9e7fff 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -7917,7 +7917,7 @@ First try @code{git stash apply --index}, which tries to 
preserve
 the index stored in the stash, if any.  This may fail because
 applying the stash could result in conflicts and those have to
 be stored in the index, making it impossible to also store the
-stash's index there as well.
+stash's index there.
 
 If the above failed, then try @code{git stash apply}.  This fails
 (with or without @code{--index}) if there are any uncommitted
@@ -7943,7 +7943,7 @@ First try @code{git stash pop --index}, which tries to 
preserve
 the index stored in the stash, if any.  This may fail because
 applying the stash could result in conflicts and those have to
 be stored in the index, making it impossible to also store the
-stash's index there as well.
+stash's index there.
 
 If the above failed, then try @code{git stash apply}.  This fails
 (with or without @code{--index}) if there are any uncommitted
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index e09bb789d9..19d0786551 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -266,7 +266,7 @@ First try \"git stash apply --index\", which tries to 
preserve
 the index stored in the stash, if any.  This may fail because
 applying the stash could result in conflicts and those have to
 be stored in the index, making it impossible to also store the
-stash's index there as well.
+stash's index there.
 
 If the above failed, then try \"git stash apply\".  This fails
 \(with or without \"--index\") if there are any uncommitted
@@ -288,7 +288,7 @@ First try \"git stash pop --index\", which tries to preserve
 the index stored in the stash, if any.  This may fail because
 applying the stash could result in conflicts and those have to
 be stored in the index, making it impossible to also store the
-stash's index there as well.
+stash's index there.
 
 If the above failed, then try \"git stash apply\".  This fails
 \(with or without \"--index\") if there are any uncommitted



reply via email to

[Prev in Thread] Current Thread [Next in Thread]