mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

; Move text about C-x v v from Diff mode buffers into main list

Browse source 
* 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.
This commit is contained in:
Sean Whitton 2025-07-06 13:38:55 +01:00
parent 08c5f68e0b
commit 67ddf21576
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/emacs/maintaining.texi
View file

@ -558,7 +558,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. 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 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 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 @item
If every file in the VC fileset has been either newly-added or If every file in the VC fileset has been either newly-added or
@ -566,6 +566,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, @file{*vc-log*} buffer; type the desired log entry for the changes,
followed by @kbd{C-c C-c} to commit. @xref{Log Buffer}. 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, With modern decentralized version control systems (Git, Mercurial,
etc.), the changes are committed locally and not automatically etc.), the changes are committed locally and not automatically
propagated to the upstream repository (which is usually on a remote propagated to the upstream repository (which is usually on a remote
@ -595,12 +601,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 @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}). 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 @node VC With A Locking VCS
@subsubsection Basic Version Control with Locking @subsubsection Basic Version Control with Locking