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

Soft resetting.

Browse source
This commit is contained in:
Marius Vollmer 2008-08-06 14:48:03 +03:00
parent e9132a53d4
commit adfb76c91d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
magit.el
View file

@ -179,7 +179,7 @@
(define-key magit-keymap (kbd "a") 'magit-stage-thing-at-point) (define-key magit-keymap (kbd "a") 'magit-stage-thing-at-point)
(define-key magit-keymap (kbd "u") 'magit-unstage-thing-at-point) (define-key magit-keymap (kbd "u") 'magit-unstage-thing-at-point)
(define-key magit-keymap (kbd "i") 'magit-ignore-thing-at-point) (define-key magit-keymap (kbd "i") 'magit-ignore-thing-at-point)
(define-key magit-keymap (kbd "x") 'magit-revert-thing-at-point) (define-key magit-keymap (kbd "x") 'magit-reset-soft)
(define-key magit-keymap (kbd "X") 'magit-reset-hard) (define-key magit-keymap (kbd "X") 'magit-reset-hard)
(define-key magit-keymap (kbd "RET") 'magit-visit-thing-at-point) (define-key magit-keymap (kbd "RET") 'magit-visit-thing-at-point)
(define-key magit-keymap (kbd "b") 'magit-switch-branch) (define-key magit-keymap (kbd "b") 'magit-switch-branch)
@ -398,6 +398,10 @@
;;; Resetting ;;; Resetting
(defun magit-reset-soft (target)
(interactive (list (read-string "Reset to: " "HEAD^")))
(magit-run "git" "reset" "--soft" target))
(defun magit-reset-hard (target) (defun magit-reset-hard (target)
(interactive (list (read-string "Hard reset to: " "HEAD"))) (interactive (list (read-string "Hard reset to: " "HEAD")))
(if (yes-or-no-p (if (yes-or-no-p