From 16a91430b65ccd4cb65d4b3229eb825a92a886c3 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 6 Jul 2025 13:38:55 +0100 Subject: [PATCH] ; Move text about C-x v v from Diff mode buffers into main list * doc/emacs/maintaining.texi (VC With A Merging VCS): Move text about C-x v v from a Diff mode buffer into the bulleted list. (cherry picked from commit 67ddf2157659e9cd6fb9b109049da66c7abe4ffb) --- doc/emacs/maintaining.texi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index b372e86f53d..49effd05ce9 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -553,7 +553,7 @@ cannot find a system to register under, it prompts for a repository type, creates a new repository, and registers the VC fileset with it. You can also specify the system explicitly, see @ref{Advanced C-x v v}. Note that registering the files doesn't commit them; you must -invoke @w{@kbd{C-x v v}} again to commit, see below. +invoke @w{@kbd{C-x v v}} again to commit; see the next point. @item If every file in the VC fileset has been either newly-added or @@ -561,6 +561,12 @@ modified, commit the changed files. To do this, Emacs pops up a @file{*vc-log*} buffer; type the desired log entry for the changes, followed by @kbd{C-c C-c} to commit. @xref{Log Buffer}. +If @kbd{C-x v v} is invoked from a buffer under Diff mode, the command +treats the buffer as holding a set of patches for one or more files. It +then applies the changes to the respective files and commits the changes +after popping up the @file{*vc-log*} buffer to allow you to type a +suitable commit log message. + With modern decentralized version control systems (Git, Mercurial, etc.), the changes are committed locally and not automatically propagated to the upstream repository (which is usually on a remote @@ -590,12 +596,6 @@ changes. In addition, locking is possible with RCS even in this mode: @kbd{C-x v v} with an unmodified file locks the file, just as it does with RCS in its normal locking mode (@pxref{VC With A Locking VCS}). - If @kbd{C-x v v} is invoked from a buffer under Diff Mode, the -command assumes the buffer holds a set of patches for one or more -files. It then applies the changes to the respective files and -commits the changes after popping up the @file{*vc-log*} buffer to -allow you to type a suitable commit log message. - @node VC With A Locking VCS @subsubsection Basic Version Control with Locking -- 2.39.5