From c67f8f298a21be61362d049cfff5273f7d010d75 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sat, 23 May 2020 05:08:06 +0300 Subject: [PATCH] Implement 'mark-resolved' for the Git backend * lisp/vc/vc-git.el (vc-git-mark-resolved): New function. --- lisp/vc/vc-git.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 2caa287bce2..dcb52282656 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -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 ;; HISTORY FUNCTIONS ;; * 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] -- 2.39.5