diff options
| author | Sean Whitton | 2025-07-06 13:38:55 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-07-06 14:03:31 +0100 |
| commit | 67ddf2157659e9cd6fb9b109049da66c7abe4ffb (patch) | |
| tree | 56d74ebafd68d132a1120e266d9e539dc6a7fc12 | |
| parent | 08c5f68e0b92a994e41f572a1face6be5b95f1d4 (diff) | |
| download | emacs-67ddf2157659e9cd6fb9b109049da66c7abe4ffb.tar.gz emacs-67ddf2157659e9cd6fb9b109049da66c7abe4ffb.zip | |
; 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.
| -rw-r--r-- | doc/emacs/maintaining.texi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 6f48571e8ac..12770f218ca 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -558,7 +558,7 @@ cannot find a system to register under, it prompts for a repository | |||
| 558 | type, creates a new repository, and registers the VC fileset with it. | 558 | type, creates a new repository, and registers the VC fileset with it. |
| 559 | You can also specify the system explicitly, see @ref{Advanced C-x v | 559 | You can also specify the system explicitly, see @ref{Advanced C-x v |
| 560 | v}. Note that registering the files doesn't commit them; you must | 560 | v}. Note that registering the files doesn't commit them; you must |
| 561 | invoke @w{@kbd{C-x v v}} again to commit, see below. | 561 | invoke @w{@kbd{C-x v v}} again to commit; see the next point. |
| 562 | 562 | ||
| 563 | @item | 563 | @item |
| 564 | If every file in the VC fileset has been either newly-added or | 564 | 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 | |||
| 566 | @file{*vc-log*} buffer; type the desired log entry for the changes, | 566 | @file{*vc-log*} buffer; type the desired log entry for the changes, |
| 567 | followed by @kbd{C-c C-c} to commit. @xref{Log Buffer}. | 567 | followed by @kbd{C-c C-c} to commit. @xref{Log Buffer}. |
| 568 | 568 | ||
| 569 | If @kbd{C-x v v} is invoked from a buffer under Diff mode, the command | ||
| 570 | treats the buffer as holding a set of patches for one or more files. It | ||
| 571 | then applies the changes to the respective files and commits the changes | ||
| 572 | after popping up the @file{*vc-log*} buffer to allow you to type a | ||
| 573 | suitable commit log message. | ||
| 574 | |||
| 569 | With modern decentralized version control systems (Git, Mercurial, | 575 | With modern decentralized version control systems (Git, Mercurial, |
| 570 | etc.), the changes are committed locally and not automatically | 576 | etc.), the changes are committed locally and not automatically |
| 571 | propagated to the upstream repository (which is usually on a remote | 577 | 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: | |||
| 595 | @kbd{C-x v v} with an unmodified file locks the file, just as it does | 601 | @kbd{C-x v v} with an unmodified file locks the file, just as it does |
| 596 | with RCS in its normal locking mode (@pxref{VC With A Locking VCS}). | 602 | with RCS in its normal locking mode (@pxref{VC With A Locking VCS}). |
| 597 | 603 | ||
| 598 | If @kbd{C-x v v} is invoked from a buffer under Diff Mode, the | ||
| 599 | command assumes the buffer holds a set of patches for one or more | ||
| 600 | files. It then applies the changes to the respective files and | ||
| 601 | commits the changes after popping up the @file{*vc-log*} buffer to | ||
| 602 | allow you to type a suitable commit log message. | ||
| 603 | |||
| 604 | @node VC With A Locking VCS | 604 | @node VC With A Locking VCS |
| 605 | @subsubsection Basic Version Control with Locking | 605 | @subsubsection Basic Version Control with Locking |
| 606 | 606 | ||