]> git.eshelyaron.com Git - emacs.git/commitdiff
Update the git backend's header comment.
authorEric S. Raymond <esr@thyrsus.com>
Tue, 2 Dec 2014 01:00:40 +0000 (20:00 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Tue, 2 Dec 2014 01:00:40 +0000 (20:00 -0500)
lisp/vc/vc-git.el

index 93a129c1fc4c46948d1c0f332ae07ddb282593a6..93c5ff805f6c371d1b57fa68f238390c72251eb2 100644 (file)
@@ -50,6 +50,8 @@
 ;; STATE-QUERYING FUNCTIONS
 ;; * registered (file)                             OK
 ;; * state (file)                                  OK
+;; * dir-status (dir update-function)              OK
+;; - dir-status-files (dir files ds uf)            NOT NEEDED
 ;; * working-revision (file)                       OK
 ;; - latest-on-branch-p (file)                     NOT NEEDED
 ;; * checkout-model (files)                        OK
 ;; * checkout (file &optional rev)                 OK
 ;; * revert (file &optional contents-done)         OK
 ;; - rollback (files)                              COULD BE SUPPORTED
-;; - merge (file rev1 rev2)                   It would be possible to merge
+;; - merge-file (file rev1 rev2)            It would be possible to merge
 ;;                                          changes into a single file, but
 ;;                                          when committing they wouldn't
 ;;                                          be identified as a merge
 ;;                                          by git, so it's probably
 ;;                                          not a good idea.
-;; - merge-news (file)                     see `merge'
+;; - merge-news (file)                      see `merge-file'
 ;; - steal-lock (file &optional revision)          NOT NEEDED
 ;; HISTORY FUNCTIONS
 ;; * print-log (files buffer &optional shortlog start-revision limit)   OK