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

Applying and reverting hunks and diffs.

Browse source
This commit is contained in:
Marius Vollmer 2008-09-13 23:18:12 +03:00
parent c93e41b5bb
commit 99dae2441e
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
magit.el
View file

@ -36,7 +36,6 @@
;; For 0.6:
;;
;; - Applying and reverting hunks and diffs.
;; - Only mark pending commits as used when the apply was successful
;; - Refuse to apply and revert merge commits.
;; - Clean up utilities.
@ -1663,11 +1662,19 @@ Please see the manual for a complete description of Magit.
(magit-rewrite-set-commit-property info 'used t)
(magit-apply-commit info))
((commit)
(magit-apply-commit info))))
(magit-apply-commit info))
((unstaged *)
(error "Change is already in your working tree"))
((staged *)
(error "Change is already in your working tree"))
((hunk)
(magit-apply-hunk-item item))
((diff)
(magit-apply-diff-item item))))
(defun magit-cherry-pick ()
(interactive)
(magit-section-case (item info "apply")
(magit-section-case (item info "cherry-pick")
((pending commit)
(magit-rewrite-set-commit-property info 'used t)
(magit-run "git" "cherry-pick" info))
@ -1686,7 +1693,11 @@ Please see the manual for a complete description of Magit.
(magit-rewrite-set-commit-property info 'used nil)
(magit-revert-commit info))
((commit)
(magit-revert-commit info))))
(magit-revert-commit info))
((hunk)
(magit-apply-hunk-item item "--reverse"))
((diff)
(magit-apply-diff-item item "--reverse"))))
(defun magit-refresh-log-buffer (range args)
(magit-create-buffer-sections