From c02fffb97e5be5c21320165dfeb03d95cc2d3678 Mon Sep 17 00:00:00 2001 From: Phil Jackson Date: Wed, 1 Sep 2010 22:28:33 +0100 Subject: [PATCH] Added push/pull menus. --- magit-key-mode.el | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/magit-key-mode.el b/magit-key-mode.el index 02fc8fdd..85d32863 100644 --- a/magit-key-mode.el +++ b/magit-key-mode.el @@ -30,10 +30,10 @@ (define-key map (kbd "R") 'magit-rebase-step) (define-key map (kbd "t") (lambda () (interactive) (magit-key-mode 'tagging))) (define-key map (kbd "r") (lambda () (interactive) (magit-key-mode 'rewriting))) - (define-key map (kbd "P") 'magit-push) + (define-key map (kbd "P") (lambda () (interactive) (magit-key-mode 'pushing))) (define-key map (kbd "f") 'magit-remote-update) (define-key map (kbd "b") (lambda () (interactive) (magit-key-mode 'branching))) - (define-key map (kbd "F") 'magit-pull) + (define-key map (kbd "F") (lambda () (interactive) (magit-key-mode 'pulling))) (define-key map (kbd "c") 'magit-log-edit) (define-key map (kbd "l") (lambda () (interactive) (magit-key-mode 'logging))) (define-key map (kbd "$") 'magit-display-process) @@ -168,6 +168,16 @@ ("=a" "Author" "--author" read-from-minibuffer) ("=g" "Grep" "--grep" read-from-minibuffer))) + (pushing + (actions + ("p" "Push" magit-push))) + + (pulling + (actions + ("p" "Pull" magit-pull)) + (switches + ("-r" "Rebase" "--rebase"))) + (branching (actions ("V" "Branch manager" magit-show-branches)