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

Real cherry picking.

Browse source 
* magit.el (magit-mode-map): Bind it to 'A'.
(magit-cherry-pick): New.
(magit-apply-item): Use diff and apply instead of cherry-pick so that
we can change a unclean work tree.
This commit is contained in:
Marius Vollmer 2008-08-30 21:37:01 +03:00
parent 45bff9c642
commit 45055cdf3e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
magit.el
View file

@ -532,6 +532,7 @@ Many Magit faces inherit from this one by default."
(define-key map (kbd "d") 'magit-diff-working-tree) (define-key map (kbd "d") 'magit-diff-working-tree)
(define-key map (kbd "D") 'magit-diff) (define-key map (kbd "D") 'magit-diff)
(define-key map (kbd "a") 'magit-apply-item) (define-key map (kbd "a") 'magit-apply-item)
(define-key map (kbd "A") 'magit-cherry-pick)
(define-key map (kbd "v") 'magit-revert-item) (define-key map (kbd "v") 'magit-revert-item)
(define-key map (kbd "x") 'magit-reset-head) (define-key map (kbd "x") 'magit-reset-head)
(define-key map (kbd "X") 'magit-reset-working-tree) (define-key map (kbd "X") 'magit-reset-working-tree)
@ -1039,8 +1040,14 @@ Please see the manual for a complete description of Magit.
((commit) ((commit)
(magit-append-to-log-edit (magit-append-to-log-edit
(magit-format-commit info "%s%n%n%b%n(Cherrypicked from %H)")) (magit-format-commit info "%s%n%n%b%n(Cherrypicked from %H)"))
(magit-run "git" "cherry-pick" "--no-commit" info)))) (magit-run-shell "git diff %s^ %s | git apply -"))))
(defun magit-cherry-pick ()
(interactive)
(magit-item-case (item info "apply")
((commit)
(magit-run "git" "cherry-pick" info))))
(defun magit-revert-item () (defun magit-revert-item ()
(interactive) (interactive)
(magit-item-case (item info "revert") (magit-item-case (item info "revert")