aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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