diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-20 18:16:10 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-20 18:16:10 -0500 |
| commit | 1aaae3f39e02d2190dc59c2b56e1c0356863730c (patch) | |
| tree | 39297376ad4d0f0a140b2773affa630b0ec9455f /doc/emacs/emacs.texi | |
| parent | 76dabd3729b43a7165dea82b92afc641078af881 (diff) | |
| download | emacs-1aaae3f39e02d2190dc59c2b56e1c0356863730c.tar.gz | |
Document VC headers and other VC changes.
* maintaining.texi (Version Control): Say "commit", not "check in".
(Version Control Systems): Simplify descriptions.
(VCS Merging, VCS Changesets, VCS Repositories): New nodes, split from
VCS Concepts.
(VC Mode Line): Update example.
(Old Revisions): Document revert-buffer for vc-diff.
(Log Buffer): Promote to a subsection. Document header lines.
* emacs.texi (Top): Update node listing.
Diffstat (limited to 'doc/emacs/emacs.texi')
| -rw-r--r-- | doc/emacs/emacs.texi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index b9dd51a85e6..91ce399d4c1 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -770,6 +770,7 @@ Version Control * Introduction to VC:: How version control works in general. * VC Mode Line:: How the mode line shows version control status. * Basic VC Editing:: How to edit a file under version control. +* Log Buffer:: Features available in log entry buffers. * Old Revisions:: Examining and comparing old versions. * Secondary VC Commands:: The commands used a little less frequently. * VC Directory Mode:: Listing files managed by version control. @@ -784,6 +785,9 @@ Introduction to Version Control * Why Version Control?:: Understanding the problems it addresses. * Version Control Systems:: Supported version control back-end systems. * VCS Concepts:: Words and concepts related to version control. +* VCS Merging:: How file conflicts are handled. +* VCS Changesets:: Changesets in version control. +* VCS Repositories:: Where version control repositories are stored. * Types of Log File:: The VCS log in contrast to the ChangeLog. Basic Editing under Version Control @@ -791,7 +795,6 @@ Basic Editing under Version Control * VC With A Merging VCS:: Without locking: default mode for CVS. * VC With A Locking VCS:: RCS in its default mode, SCCS, and optionally CVS. * Advanced C-x v v:: Advanced features available with a prefix argument. -* Log Buffer:: Features available in log entry buffers. The Secondary Commands of VC |