magit-reset-head is also put wherever there are commits
Signed-off-by: Rémi Vanicat <[email protected]>
---
magit.el | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/magit.el b/magit.el
index 68feb38..df5d44c 100644
--- a/magit.el
+++ b/magit.el
@@ -1365,8 +1365,6 @@ FUNC should leave point at the end of the modified region"
(define-key map (kbd "L") 'magit-log-long)
(define-key map (kbd "h") 'magit-reflog-head)
(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 "!") 'magit-shell-command)
(define-key map (kbd "RET") 'magit-visit-item)
(define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
@@ -1386,10 +1384,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 "t") 'magit-tag)
- (define-key map (kbd "T") 'magit-annotated-tag)
- (define-key map (kbd "z") 'magit-stash)
- (define-key map (kbd "Z") 'magit-stash-snapshot)
(define-key map (kbd "w") 'magit-wazzup)
(define-key map (kbd "$") 'magit-display-process)
(define-key map (kbd "E") 'magit-interactive-rebase)
@@ -1426,6 +1420,12 @@ FUNC should leave point at the end of the modified
region"
(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)
+ (define-key map (kbd "x") 'magit-reset-head)
+ (define-key map (kbd "X") 'magit-reset-working-tree)
+ (define-key map (kbd "t") 'magit-tag)
+ (define-key map (kbd "T") 'magit-annotated-tag)
+ (define-key map (kbd "z") 'magit-stash)
+ (define-key map (kbd "Z") 'magit-stash-snapshot)
map))
(defvar magit-stash-mode-map
@@ -1451,6 +1451,7 @@ 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 "x") 'magit-reset-head)
map))
(defvar magit-reflog-mode-map
@@ -1462,6 +1463,7 @@ FUNC should leave point at the end of the modified region"
(define-key map (kbd "a") 'magit-apply-item)
(define-key map (kbd "A") 'magit-cherry-pick-item)
(define-key map (kbd "v") 'magit-revert-item)
+ (define-key map (kbd "x") 'magit-reset-head)
map))
(defvar magit-diff-mode-map
@@ -1487,6 +1489,7 @@ 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 "x") 'magit-reset-head)
map))
(easy-menu-define magit-mode-menu magit-mode-map
--
1.7.0.4
