From 818ad5e68feb6bc650be29be3a25ab74d69f28e1 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 17 Feb 2026 15:50:30 +0000 Subject: [PATCH] ; Docstring fix for outstanding changes commands. --- lisp/vc/vc.el | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 94b484f1103..241f42ee0c9 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -3361,11 +3361,9 @@ Uncommitted changes are included in the diff. When unspecified, UPSTREAM-LOCATION is the outgoing base. For a trunk branch this is always the place \\[vc-push] would push to. -For a topic branch, see whether the branch matches one of -`vc-trunk-branch-regexps' or `vc-topic-branch-regexps', or else query -the backend for an appropriate outgoing base. +For a topic branch, query the backend for an appropriate outgoing base. See `vc-trunk-or-topic-p' regarding the difference between trunk and -topic branches. +topic branches and how Emacs classifies the current branch. When called interactively with a prefix argument, prompt for UPSTREAM-LOCATION. In some version control systems, UPSTREAM-LOCATION @@ -3391,11 +3389,9 @@ Uncommitted changes are included in the diff. When unspecified, UPSTREAM-LOCATION is the outgoing base. For a trunk branch this is always the place \\[vc-push] would push to. -For a topic branch, see whether the branch matches one of -`vc-trunk-branch-regexps' or `vc-topic-branch-regexps', or else query -the backend for an appropriate outgoing base. +For a topic branch, query the backend for an appropriate outgoing base. See `vc-trunk-or-topic-p' regarding the difference between trunk and -topic branches. +topic branches and how Emacs classifies the current branch. When called interactively with a prefix argument, prompt for UPSTREAM-LOCATION. In some version control systems, UPSTREAM-LOCATION @@ -3427,11 +3423,9 @@ working revision and UPSTREAM-LOCATION. When unspecified, UPSTREAM-LOCATION is the outgoing base. For a trunk branch this is always the place \\[vc-push] would push to. -For a topic branch, see whether the branch matches one of -`vc-trunk-branch-regexps' or `vc-topic-branch-regexps', or else query -the backend for an appropriate outgoing base. +For a topic branch, query the backend for an appropriate outgoing base. See `vc-trunk-or-topic-p' regarding the difference between trunk and -topic branches. +topic branches and how Emacs classifies the current branch. When called interactively with a prefix argument, prompt for UPSTREAM-LOCATION. In some version control systems, UPSTREAM-LOCATION @@ -3461,11 +3455,9 @@ working revision and UPSTREAM-LOCATION. When unspecified, UPSTREAM-LOCATION is the outgoing base. For a trunk branch this is always the place \\[vc-push] would push to. -For a topic branch, see whether the branch matches one of -`vc-trunk-branch-regexps' or `vc-topic-branch-regexps', or else query -the backend for an appropriate outgoing base. +For a topic branch, query the backend for an appropriate outgoing base. See `vc-trunk-or-topic-p' regarding the difference between trunk and -topic branches. +topic branches and how Emacs classifies the current branch. When called interactively with a prefix argument, prompt for UPSTREAM-LOCATION. In some version control systems, UPSTREAM-LOCATION