Skip to content

Instantly share code, notes, and snippets.

@arielshaqed
Created February 2, 2021 07:54
Show Gist options
  • Save arielshaqed/f6f38a793550ff87587fde33a312dc85 to your computer and use it in GitHub Desktop.
Save arielshaqed/f6f38a793550ff87587fde33a312dc85 to your computer and use it in GitHub Desktop.
add "r o" and "d o" to magit: diff and rebase with origin/master
;;; Define "r o" (an "o" suffix) for "magit rebase onto origin/master"
(require 'magit)
(transient-define-suffix as-magit-rebase-onto-origin-master (args)
"Rebase the current branch onto origin/master.
TODO(ariels): Make it better and also document it."
:if 'magit-get-current-branch
:description "origin/master"
(interactive (list (magit-rebase-arguments)))
(magit-git-rebase "origin/master" args))
(transient-insert-suffix 'magit-rebase "p"
(list "o" #'as-magit-rebase-onto-origin-master))
(transient-define-suffix as-magit-diff-origin-master (args)
"Diff with origin/master.
TODO(ariels): Make it better and also document it."
:description "origin/master"
(interactive (list (magit-rebase-arguments)))
(magit-diff-setup-buffer "origin/master" nil args nil))
(transient-insert-suffix 'magit-diff "r"
(list "o" #'as-magit-diff-origin-master))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment