diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-15 13:27:02 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-15 13:27:02 +0200 |
| commit | 8aa2ef5e7639b6c064c0f7ebebe7ffda316aa6d6 (patch) | |
| tree | 0ca166611e9a4160000b7b543bef568bd37ca8ae /lisp | |
| parent | 492c7aab19d215b2330bdd9b1498d41bb3274290 (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 'lisp')
| -rw-r--r-- | lisp/magit-sequence.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el index 1cd2b8d..c83a8ba 100644 --- a/lisp/magit-sequence.el +++ b/lisp/magit-sequence.el @@ -294,7 +294,7 @@ This discards all changes made since the sequence started." (?A "Autostash" "--autostash")) :actions '((?r "Rebase" magit-rebase) (?f "Autosquash" magit-rebase-autosquash) - (?o "Rebase subset" magit-rebase-from) + (?o "Rebase subset" magit-rebase-subset) nil (?e "Rebase interactive" magit-rebase-interactive) (?s "Edit commit" magit-rebase-edit-commit) @@ -322,7 +322,7 @@ All commits not in UPSTREAM are rebased. (message "Rebasing...done")) ;;;###autoload -(defun magit-rebase-from (newbase start &optional args) +(defun magit-rebase-subset (newbase start &optional args) "Start a non-interactive rebase sequence. Commits from START to `HEAD' onto NEWBASE. START has to be selected from a list of recent commits. @@ -339,7 +339,7 @@ selected from a list of recent commits. (message "Rebasing...done")) (magit-log-select `(lambda (commit) - (magit-rebase-from ,newbase (concat commit "^") (list ,@args))) + (magit-rebase-subset ,newbase (concat commit "^") (list ,@args))) (concat "Type %p on a commit to rebase it " "and commits above it onto " newbase ",")))) |