diff options
Diffstat (limited to 'lisp/vc/vc.el')
| -rw-r--r-- | lisp/vc/vc.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 19da4102872..e1141cb392d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1889,6 +1889,7 @@ The headers are reset to their non-expanded form." ;;;###autoload (defun vc-merge () "Perform a version control merge operation. +You must be visiting a version controlled file, or in a `vc-dir' buffer. On a distributed version control system, this runs a \"merge\" operation to incorporate changes from another branch onto the current branch, prompting for an argument list. @@ -2366,6 +2367,7 @@ depending on the underlying version-control system." ;;;###autoload (defun vc-pull (&optional arg) "Update the current fileset or branch. +You must be visiting a version controlled file, or in a `vc-dir' buffer. On a distributed version control system, this runs a \"pull\" operation to update the current branch, prompting for an argument list if required. Optional prefix ARG forces a prompt. |