From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 3 Oct 2021 14:03:03 +0000 (+0100)
Subject: el/dot-emacs.el: Add a switch for the `--rebase-merges' option.
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/60803ce379daa5eb0b410719e5054985201ef8a8

el/dot-emacs.el: Add a switch for the `--rebase-merges' option.
---

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f164c40..7623c72 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -4977,7 +4977,9 @@ This allows you to pass a list of arguments through `ansi-term'."
 			   magit-diff-refresh-popup
 			   magit-diff-mode-refresh-popup
 			   magit-revision-mode-refresh-popup))
-	    (magit-define-popup-switch popup ?R "Reverse diff" "-R"))))
+	    (magit-define-popup-switch popup ?R "Reverse diff" "-R"))
+	  (magit-define-popup-switch 'magit-rebase-popup ?r
+				     "Rebase merges" "--rebase-merges")))
 
 (defadvice magit-wip-commit-buffer-file
     (around mdw-just-this-buffer activate compile)