gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added a merge menu.

Browse source
This commit is contained in:
Phil Jackson 2010-09-03 18:34:37 +01:00
parent ee84d43a18
commit 653cc89684
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
magit-key-mode.el
View file

@ -1,5 +1,9 @@
(require 'assoc) (require 'assoc)
(progn
(unload-feature 'magit t)
(require 'magit))
(defvar magit-mode-map (defvar magit-mode-map
(let ((map (make-keymap))) (let ((map (make-keymap)))
(suppress-keymap map t) (suppress-keymap map t)
@ -85,8 +89,9 @@
(define-key map (kbd "b") (lambda () (define-key map (kbd "b") (lambda ()
(interactive) (interactive)
(magit-key-mode 'branching))) (magit-key-mode 'branching)))
(define-key map (kbd "m") 'magit-manual-merge) (define-key map (kbd "m") (lambda ()
(define-key map (kbd "M") 'magit-automatic-merge) (interactive)
(magit-key-mode 'merging)))
(define-key map (kbd "k") 'magit-discard-item) (define-key map (kbd "k") 'magit-discard-item)
(define-key map (kbd "e") 'magit-interactive-resolve-item) (define-key map (kbd "e") 'magit-interactive-resolve-item)
(define-key map (kbd "C") 'magit-add-log) (define-key map (kbd "C") 'magit-add-log)
@ -119,8 +124,9 @@
(define-key map (kbd "b") (lambda () (define-key map (kbd "b") (lambda ()
(interactive) (interactive)
(magit-key-mode 'branching))) (magit-key-mode 'branching)))
(define-key map (kbd "m") 'magit-manual-merge) (define-key map (kbd "m") (lambda ()
(define-key map (kbd "M") 'magit-automatic-merge) (interactive)
(magit-key-mode 'merging)))
(define-key map (kbd "x") 'magit-reset-head) (define-key map (kbd "x") 'magit-reset-head)
(define-key map (kbd "e") 'magit-log-show-more-entries) (define-key map (kbd "e") 'magit-log-show-more-entries)
(define-key map (kbd "l") (lambda () (define-key map (kbd "l") (lambda ()
@ -162,8 +168,9 @@
(define-key map (kbd "b") (lambda () (define-key map (kbd "b") (lambda ()
(interactive) (interactive)
(magit-key-mode 'branching))) (magit-key-mode 'branching)))
(define-key map (kbd "m") 'magit-manual-merge) (define-key map (kbd "m") (lambda ()
(define-key map (kbd "M") 'magit-automatic-merge) (interactive)
(magit-key-mode 'merging)))
(define-key map (kbd "x") 'magit-reset-head) (define-key map (kbd "x") 'magit-reset-head)
(define-key map (kbd "i") 'magit-ignore-item) (define-key map (kbd "i") 'magit-ignore-item)
map)) map))
@ -235,6 +242,16 @@
(switches (switches
("-f" "Force" "-f"))) ("-f" "Force" "-f")))
(merging
(actions
("m" "Manual" magit-manual-merge)
("M" "Automatic" magit-automatic-merge))
(switches
("-n" "No fast-forward" "--no-ff")
("-sq" "Squash" "--sqaush"))
(arguments
("-st" "Strategy" "--strategy" read-from-minibuffer)))
(rewriting (rewriting
(actions (actions
("b" "Begin" magit-rewrite-start) ("b" "Begin" magit-rewrite-start)