diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-15 13:38:17 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-15 13:38:17 +0200 |
| commit | f6f3e3bbfed0b250170d5d682e25f4ad7c5c511b (patch) | |
| tree | a23191b6f2ec0aaf5cf2f729afb8c0cddb1c32c4 /Documentation | |
| parent | 8aa2ef5e7639b6c064c0f7ebebe7ffda316aa6d6 (diff) | |
magit.org: document magit-rebase-unpushed
Re #2174.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/magit.org | 9 | ||||
| -rw-r--r-- | Documentation/magit.texi | 11 |
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}) |