aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/magit.org9
-rw-r--r--Documentation/magit.texi11
2 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/magit.org b/Documentation/magit.org
index 502d25f..fe18abb 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -2828,6 +2828,15 @@ following commands.
Start an interactive rebase sequence.
+- Key: r l, magit-rebase-unpushed
+
+ Start an interactive rebase sequence of unpushed commits. This is
+ like ~magit-rebase-interactive~, but if the upstream of the current
+ branch is configured, then all commits since the merge-base are
+ rebased. If there is no upstream or no merge-base, then the user
+ has to select the first commit to be rebased like for
+ ~magit-rebase-interactive~.
+
- Key: r f, magit-rebase-autosquash
Combine squash and fixup commits with their intended targets.
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 0d34d55..d193ebe 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -3981,6 +3981,17 @@ commits.
Start an interactive rebase sequence.
+@kindex r l
+@cindex magit-rebase-unpushed
+@item @kbd{r l} @tie{}@tie{}@tie{}@tie{}(@code{magit-rebase-unpushed})
+
+Start an interactive rebase sequence of unpushed commits. This is
+like @code{magit-rebase-interactive}, but if the upstream of the current
+branch is configured, then all commits since the merge-base are
+rebased. If there is no upstream or no merge-base, then the user
+has to select the first commit to be rebased like for
+@code{magit-rebase-interactive}.
+
@kindex r f
@cindex magit-rebase-autosquash
@item @kbd{r f} @tie{}@tie{}@tie{}@tie{}(@code{magit-rebase-autosquash})