branch: elpa/magit
commit be9b722e2248b8465c561867cc99cb0c62e79dd4
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>
manual: Drop a repeated paragraph
---
docs/magit.org | 5 -----
docs/magit.texi | 5 -----
2 files changed, 10 deletions(-)
diff --git a/docs/magit.org b/docs/magit.org
index 1139d00480..39fcd011f8 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -6604,11 +6604,6 @@ Also see [[man:git-stash]]
When using Git v2.38.0 or later, behave more intelligently:
- 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.
-
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
diff --git a/docs/magit.texi b/docs/magit.texi
index eb22c3d753..e528aca4aa 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -7848,11 +7848,6 @@ or with a prefix argument @code{git stash apply --index}.
When using Git v2.38.0 or later, behave more intelligently:
-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.
-
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
