Skip to content

Instantly share code, notes, and snippets.

@mgalgs
Created October 14, 2013 18:23
Show Gist options
  • Save mgalgs/6979817 to your computer and use it in GitHub Desktop.
Save mgalgs/6979817 to your computer and use it in GitHub Desktop.
diff --git a/magit.el b/magit.el
index 209418a..bbcabbc 100644
--- a/magit.el
+++ b/magit.el
@@ -5237,7 +5237,7 @@ Return nil if there is no rebase in progress."
(cons (concat "refs/heads/" branch)
magit-uninteresting-refs)
magit-uninteresting-refs))))
- (magit-run-git "rebase" (magit-rev-to-git rev)))))
+ (magit-run-git "rebase" "--autosquash" "--autostash" (magit-rev-to-git rev)))))
;;;###autoload
(defun magit-interactive-rebase (commit)
@@ -5251,7 +5251,7 @@ Return nil if there is no rebase in progress."
(magit-read-rev "Interactively rebase to" (magit-guess-branch))))))
(magit-assert-emacsclient "rebase interactively")
(magit-with-emacsclient magit-server-window-for-rebase
- (magit-run-git-async "rebase" "-i" commit)))
+ (magit-run-git-async "rebase" "-i" "--autosquash" "--autostash" commit)))
;;;; Reset
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment