branch: elpa/magit commit 8edb640599de64b96ebc46e1836f2f68c59a443d Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
Regenerate manual --- docs/magit.texi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/magit.texi b/docs/magit.texi index eced27f465..14c6f21e92 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