aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2015-08-15 13:27:02 +0200
committerJonas Bernoulli <jonas@bernoul.li>2015-08-15 13:27:02 +0200
commit8aa2ef5e7639b6c064c0f7ebebe7ffda316aa6d6 (patch)
tree0ca166611e9a4160000b7b543bef568bd37ca8ae /Documentation
parent492c7aab19d215b2330bdd9b1498d41bb3274290 (diff)
rename magit-rebase-from to magit-rebase-subset
So that the name of the command matches the description in the popup. Re #2174.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/magit.org2
-rw-r--r--Documentation/magit.texi4
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/magit.org b/Documentation/magit.org
index b724c2a..502d25f 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -2818,7 +2818,7 @@ following commands.
Start a non-interactive rebase sequence. All commits not in
UPSTREAM are rebased.
-- Key: r o, magit-rebase-from
+- Key: r o, magit-rebase-subset
Start a non-interactive rebase sequence with commits from START to
~HEAD~ onto NEWBASE. START has to be selected from a list of recent
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index a2ea400..0d34d55 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -3968,8 +3968,8 @@ Start a non-interactive rebase sequence. All commits not in
UPSTREAM are rebased.
@kindex r o
-@cindex magit-rebase-from
-@item @kbd{r o} @tie{}@tie{}@tie{}@tie{}(@code{magit-rebase-from})
+@cindex magit-rebase-subset
+@item @kbd{r o} @tie{}@tie{}@tie{}@tie{}(@code{magit-rebase-subset})
Start a non-interactive rebase sequence with commits from START to
@code{HEAD} onto NEWBASE. START has to be selected from a list of recent