branch: elpa/git-commit
commit 9d4997c067d3b7e051b06bcdab22a292610a730d
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
manual: Improve notes about rebase colors once more
Re #4612.
---
docs/magit.org | 8 +++++---
docs/magit.texi | 9 ++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/docs/magit.org b/docs/magit.org
index 211d387d57..0d3c477cbf 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -5845,9 +5845,11 @@ 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
- not been applied yet. (This used to claim that they are yellow, but
- when using the default theme, that wasn't true. However some themes
- may use yellow in an effort to follow the previously listed color.)
+ not been applied yet.
+
+- Yellow commits have some special relationship to the commit rebase
+ stopped at. This is used for the words "join", "goal", "same" and
+ "work" (see below).
- Gray commits have already been applied.
diff --git a/docs/magit.texi b/docs/magit.texi
index 1729d2a00a..cf771d1eaa 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -7195,9 +7195,12 @@ The following colors are used:
@itemize
@item
Commits that use the same forground color as the @code{default} face have
-not been applied yet. (This used to claim that they are yellow, but
-when using the default theme, that wasn't true. However some themes
-may use yellow in an effort to follow the previously listed color.)
+not been applied yet.
+
+@item
+Yellow commits have some special relationship to the commit rebase
+stopped at. This is used for the words "join", "goal", "same" and
+"work" (see below).
@item
Gray commits have already been applied.
