When I use `e' to resolve conflicts during a rebase, then `R' to
continue rebasing, I often get into trouble because I haven't saved
the merged files. This little patch seems to fix it nicely for me.
diff --git a/magit.el b/magit.el
index af15e0f..3ea1de6 100644
--- a/magit.el
+++ b/magit.el
@@ -2313,6 +2313,8 @@ merge will be squashed."
(defun magit-rebase-step ()
(interactive)
+ (if magit-save-some-buffers
+ (save-some-buffers (eq magit-save-some-buffers 'dontask)))
(let ((info (magit-rebase-info)))
(if (not info)
(let ((rev (magit-read-rev "Rebase to")))
--
Dave Abrahams Meet me at BoostCon: http://www.boostcon.com
BoostPro Computing
http://www.boostpro.com
--
Subscription settings: http://groups.google.com/group/magit/subscribe?hl=en
