Commit 02e6c75b authored by Jonas Bernoulli's avatar Jonas Bernoulli

magit-rebase-autosquash: Skip usual asserts

The asserts were already run when the fixup and squash commits were
created, so we don't have to ask again.  Furthermore we always rebase
all commits since the upstream, which means that (1) changes reachable
from upstream (including its tip) are never autosquashed into by this
command, and (2) that we might rebase over commits that actually are
unaffected in the end but that would be considered problematic.

Closes #3468.
parent 37d76f40
......@@ -620,7 +620,7 @@ START has to be selected from a list of recent commits."
(interactive (list (magit-rebase-arguments)))
(magit-rebase-interactive-1 :merge-base (cons "--autosquash" args)
"Type %p on a commit to squash into it and then rebase as necessary,"
"true"))
"true" nil t))
;;;###autoload
(defun magit-rebase-edit-commit (commit args)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment