Commit c0209c74 authored by Jonas Bernoulli's avatar Jonas Bernoulli

Show graph when selecting a fixup target

Doing so helps avoid picking a commit that would result in the
flattening of a merge commit.
parent 36934483
......@@ -285,7 +285,8 @@ depending on the value of option `magit-commit-squash-confirm'."
(list "--autosquash" "--autostash")
"" "true"))))
(format "Type %%p on a commit to %s into it,"
(substring option 2)))
(substring option 2))
nil nil (list "--graph"))
(when magit-commit-show-diff
(let ((magit-display-buffer-noselect t))
(apply #'magit-diff-staged nil (magit-diff-arguments)))))))
......
......@@ -1268,11 +1268,11 @@ Type \\[magit-log-select-quit] to abort without selecting a commit."
(defvar-local magit-log-select-pick-function nil)
(defvar-local magit-log-select-quit-function nil)
(defun magit-log-select (pick &optional msg quit branch)
(defun magit-log-select (pick &optional msg quit branch args)
(declare (indent defun))
(magit-mode-setup #'magit-log-select-mode
(or branch (magit-get-current-branch) "HEAD")
magit-log-select-arguments)
(append args magit-log-select-arguments))
(magit-log-goto-same-commit)
(setq magit-log-select-pick-function pick)
(setq magit-log-select-quit-function quit)
......
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