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

Added a stash menu.

Browse source
This commit is contained in:
Phil Jackson 2010-09-03 18:50:39 +01:00
parent 653cc89684
commit 2733adb8b6
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
magit-key-mode.el
View file

@ -97,8 +97,9 @@
(define-key map (kbd "C") 'magit-add-log) (define-key map (kbd "C") 'magit-add-log)
(define-key map (kbd "x") 'magit-reset-head) (define-key map (kbd "x") 'magit-reset-head)
(define-key map (kbd "X") 'magit-reset-working-tree) (define-key map (kbd "X") 'magit-reset-working-tree)
(define-key map (kbd "z") 'magit-stash) (define-key map (kbd "z") (lambda ()
(define-key map (kbd "Z") 'magit-stash-snapshot) (interactive)
(magit-key-mode 'stashing)))
map)) map))
(defvar magit-stash-mode-map (defvar magit-stash-mode-map
@ -118,7 +119,6 @@
(define-key map (kbd "d") 'magit-diff-working-tree) (define-key map (kbd "d") 'magit-diff-working-tree)
(define-key map (kbd "D") 'magit-diff) (define-key map (kbd "D") 'magit-diff)
(define-key map (kbd "a") 'magit-apply-item) (define-key map (kbd "a") 'magit-apply-item)
(define-key map (kbd "s") 'magit-log-grep)
(define-key map (kbd "A") 'magit-cherry-pick-item) (define-key map (kbd "A") 'magit-cherry-pick-item)
(define-key map (kbd "v") 'magit-revert-item) (define-key map (kbd "v") 'magit-revert-item)
(define-key map (kbd "b") (lambda () (define-key map (kbd "b") (lambda ()
@ -242,6 +242,13 @@
(switches (switches
("-f" "Force" "-f"))) ("-f" "Force" "-f")))
(stashing
(actions
("s" "Save" magit-stash)
("S" "Snapshot" magit-stash-snapshot))
(switches
("-k" "Keep index" "--keep-index")))
(merging (merging
(actions (actions
("m" "Manual" magit-manual-merge) ("m" "Manual" magit-manual-merge)