Merge remote branch 'refs/remotes/avar/avar/interactive-rebase-read-rev'

This commit is contained in:
Phil Jackson 2010-05-31 18:10:06 +01:00
commit 927f9b2206

View file

@ -3919,7 +3919,7 @@ Return values:
(unwind-protect (unwind-protect
(magit-run-git-async "rebase" "-i" (magit-run-git-async "rebase" "-i"
(or (and commit (concat commit "^")) (or (and commit (concat commit "^"))
(read-string "Interactively rebase to: "))) (magit-read-rev "Interactively rebase to" (magit-guess-branch))))
(if old-editor (if old-editor
(setenv "GIT_EDITOR" old-editor))))) (setenv "GIT_EDITOR" old-editor)))))