magit key binding improvements

diff --git a/README.md b/README.md
index d4a32ce1db12400ecece446cb76642878ae5d4f8..65a92e3cac6136f7192075dbc95b48da5dc3757a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -231,8 +231,10 @@ M-g M-n                                         Next occurence
 ```
 C-c g d                                         Popup diff
 C-c g p                                         Previous hunk
-C-c g f                                         Next hunk
+C-c g n                                         Next hunk
+C-c g r                                         Revert hunk
 C-c g s                                         Magit status
+C-c g f                                         Magit file specific commands
 C-c g g                                         Magit dispatch popup
 p                                               Previous section
 n                                               Next section

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index e0f0ec9aa534e9f185ee1edff171b94abc81bb61..16772e252dd766aa7fb1a1f91d01bcc0e872293f 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -22,6 +22,7 @@
 (global-set-key (kbd "C-c g d") 'git-gutter:popup-hunk)
 (global-set-key (kbd "C-c g p") 'git-gutter:previous-hunk)
 (global-set-key (kbd "C-c g n") 'git-gutter:next-hunk)
+(global-set-key (kbd "C-c g r") 'git-gutter:revert-hunk)
 
 ;; Windows/frames
 (global-set-key (kbd "<C-up>") 'windmove-up)
@@ -60,6 +61,7 @@
 (global-set-key (kbd "C-x C-j") 'direx-project:jump-to-project-root-other-window)
 (global-set-key (kbd "C-c g s") 'magit-status)
 (global-set-key (kbd "C-c g g") 'magit-dispatch-popup)
+(global-set-key (kbd "C-c g f") 'magit-file-popup)
 (global-set-key (kbd "<f8>") 'flyspell-mode)
 (global-set-key (kbd "<f9>") 'whitespace-mode)
 (global-set-key (kbd "<f10>") 'toggle-truncate-lines)

diff --git a/lisp/my-shackle.el b/lisp/my-shackle.el
index a9ac44cc8edf2af6628de980dbd3e6ea5d04583d..5281a854a1ad1c6654fc698377b83118d4675f4a 100644 (file)
--- a/lisp/my-shackle.el
+++ b/lisp/my-shackle.el
@@ -6,7 +6,7 @@
                       (direx:direx-mode :align left :size 40 :select t)
                       ("*magit-.*-popup*" :regexp t :align right :size 63 :select t)
                       (magit-status-mode :align below :size 20 :select t)
-                      (magit-diff-mode :align right)))
+                      ((magit-diff-mode magit-revision-mode) :align right)))
 
 (setq shackle-default-rule '(:align below :select t :size 15))
 

diff --git a/lisp/my-vc.el b/lisp/my-vc.el
index 507083081cd317865eaa119601cb2be2f64654c2..b12ea1c3770d8a668df0c936121d26cd0014a089 100644 (file)
--- a/lisp/my-vc.el
+++ b/lisp/my-vc.el
@@ -25,10 +25,10 @@
 
 (setq magit-completing-read-function 'ivy-completing-read)
 (setq magit-display-file-buffer-function #'pop-to-buffer)
+(setcdr magit-file-mode-map nil)
 (global-magit-file-mode)
 
 
-
 (require 'vc)
 (setq vc-follow-symlinks t)
 (setq vc-handled-backends nil)