Signed-off-by: Rémi Vanicat <[email protected]>
---
magit.el | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/magit.el b/magit.el
index 169669f..68feb38 100644
--- a/magit.el
+++ b/magit.el
@@ -1367,13 +1367,11 @@ FUNC should leave point at the end of the modified
region"
(define-key map (kbd "H") 'magit-reflog)
(define-key map (kbd "x") 'magit-reset-head)
(define-key map (kbd "X") 'magit-reset-working-tree)
- (define-key map (kbd "k") 'magit-discard-item)
(define-key map (kbd "!") 'magit-shell-command)
(define-key map (kbd "RET") 'magit-visit-item)
(define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
(define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
(define-key map (kbd "C-w") 'magit-copy-item-as-kill)
- (define-key map (kbd "e") 'magit-interactive-resolve-item)
(define-key map (kbd "N r") 'magit-svn-rebase)
(define-key map (kbd "N c") 'magit-svn-dcommit)
(define-key map (kbd "N f") 'magit-svn-find-rev)
@@ -1388,7 +1386,6 @@ FUNC should leave point at the end of the modified region"
(define-key map (kbd "f") 'magit-remote-update)
(define-key map (kbd "F") 'magit-pull)
(define-key map (kbd "c") 'magit-log-edit)
- (define-key map (kbd "C") 'magit-add-log)
(define-key map (kbd "t") 'magit-tag)
(define-key map (kbd "T") 'magit-annotated-tag)
(define-key map (kbd "z") 'magit-stash)
@@ -1426,6 +1423,9 @@ FUNC should leave point at the end of the modified region"
(define-key map (kbd "B") 'magit-create-branch)
(define-key map (kbd "m") 'magit-manual-merge)
(define-key map (kbd "M") 'magit-automatic-merge)
+ (define-key map (kbd "k") 'magit-discard-item)
+ (define-key map (kbd "e") 'magit-interactive-resolve-item)
+ (define-key map (kbd "C") 'magit-add-log)
map))
(defvar magit-stash-mode-map
--
1.7.0.4
--
To unsubscribe, reply using "remove me" as the subject.
