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

Resetting.

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

12
magit.el
View file

@ -31,6 +31,7 @@
;;; TODO ;;; TODO
;; - Reverting
;; - Documentation, major mode, menu, ... ;; - Documentation, major mode, menu, ...
;; - History browsing ;; - History browsing
;; - Detect and handle renames and copies. ;; - Detect and handle renames and copies.
@ -178,6 +179,8 @@
(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-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)
(define-key magit-keymap (kbd "B") 'magit-create-branch) (define-key magit-keymap (kbd "B") 'magit-create-branch)
@ -393,6 +396,15 @@
(interactive (list (magit-read-other-branch "Merge from branch: "))) (interactive (list (magit-read-other-branch "Merge from branch: ")))
(magit-run "git" "merge" branch)) (magit-run "git" "merge" branch))
;;; Resetting
(defun magit-reset-hard (target)
(interactive (list (read-string "Hard reset to: " "HEAD")))
(if (yes-or-no-p
(format "Hard reset to %s and throw away all uncommitted changes? "
target))
(magit-run "git" "reset" "--hard" target)))
;;; Push and pull ;;; Push and pull
(defun magit-pull () (defun magit-pull ()