Commit c67f8f29 authored by Dmitry Gutov's avatar Dmitry Gutov

Implement 'mark-resolved' for the Git backend

* lisp/vc/vc-git.el (vc-git-mark-resolved): New function.
parent 5044c190
Pipeline #5643 passed with stage
in 57 minutes and 58 seconds
......@@ -72,6 +72,7 @@
;; by git, so it's probably
;; not a good idea.
;; - merge-news (file) see `merge-file'
;; - mark-resolved (file) OK
;; - steal-lock (file &optional revision) NOT NEEDED
;; * print-log (files buffer &optional shortlog start-revision limit) OK
......@@ -1530,6 +1531,9 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"."
(defun vc-git-rename-file (old new)
(vc-git-command nil 0 (list old new) "mv" "-f" "--"))
(defun vc-git-mark-resolved (files)
(vc-git-command nil 0 files "add"))
(defvar vc-git-extra-menu-map
(let ((map (make-sparse-keymap)))
(define-key map [git-grep]
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment