aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2025-04-01 19:52:55 +0200
committerJonas Bernoulli <jonas@bernoul.li>2025-04-01 19:52:55 +0200
commit8edb640599de64b96ebc46e1836f2f68c59a443d (patch)
tree20e7bffa312a8c9ea952138f219347eea8a248b2
parent2a789033ecc3d865ab1a4732d4e483caa1d4626c (diff)
Regenerate manual
-rw-r--r--docs/magit.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/magit.texi b/docs/magit.texi
index eced27f..14c6f21 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -7098,6 +7098,11 @@ This command starts an interactive rebase sequence.
This command combines squash and fixup commits with their intended
targets.
+By default only commits that are not reachable from the upstream
+branch are potentially squashed into. If no upstream is configured
+or with a prefix argument, the user is prompted for the first commit
+to potentially squash into.
+
@item @kbd{r m} (@code{magit-rebase-edit-commit})
@kindex r m
@findex magit-rebase-edit-commit