branch: externals/vc-jj
commit a86cedfedabba827e6ba63b1a52039c1972b095d
Author: Rudi Schlatte <[email protected]>
Commit: Rudi Schlatte <[email protected]>
Unify terminology
The jj documentation seems to use "change" for what git calls "commit"
and vc calls "revision". Adjust some docstrings accordingly.
---
vc-jj.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/vc-jj.el b/vc-jj.el
index 8df806038d..d14b4c7164 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -784,7 +784,7 @@ For jj, modify `.gitignore' and call `jj untrack' or `jj
track'."
0)))
(defun vc-jj-annotate-command (file buf &optional rev)
- "Fill BUF with per-line commit history of FILE at REV."
+ "Fill BUF with per-line change history of FILE at REV."
(let ((rev (or rev "@"))
(file (file-relative-name file)))
;; Contrary to most other jj commands, 'jj file annotate' takes a
@@ -809,7 +809,7 @@ For jj, modify `.gitignore' and call `jj untrack' or `jj
track'."
;; TODO: find out if the output changes when the file got renamed
;; somewhere in its history
"Regex for the output of \"jj file annotate\".
-The regex matches each line's commit information and captures
+The regex matches each line's change information and captures
four groups: change id, author, datetime, line number.")
(declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
@@ -929,7 +929,7 @@ the command to run, e.g., the semi-standard \"jj git push
-c @-\"."
(add-hook 'log-edit-mode-hook #'vc-jj-ensure-log-edit-callback)
;;;###autoload
(defun vc-jj-ensure-log-edit-callback ()
- "Set up `log-edit-callback' when editing jj commit messages."
+ "Set up `log-edit-callback' when editing jj change descriptions."
(unless (bound-and-true-p log-edit-callback)
(setq-local log-edit-callback (lambda ()
(interactive)
