[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c67f8f2: Implement 'mark-resolved' for the Git backend
From: |
Dmitry Gutov |
Subject: |
master c67f8f2: Implement 'mark-resolved' for the Git backend |
Date: |
Fri, 22 May 2020 22:08:32 -0400 (EDT) |
branch: master
commit c67f8f298a21be61362d049cfff5273f7d010d75
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
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 2caa287..dcb5228 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]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master c67f8f2: Implement 'mark-resolved' for the Git backend,
Dmitry Gutov <=