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 (file)
--- 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)