diff options
| -rw-r--r-- | doc/emacs/ChangeLog | 7 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 1 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 22 |
3 files changed, 28 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index eaae7ec5c9f..f134bd03ef9 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,10 @@ +2013-07-30 Xue Fuqiao <xfq.free@gmail.com> + + * emacs.texi (Top): Add menu entry. + + * maintaining.texi (VC Ignore): New node. Document vc-ignore. + (VC Directory Commands): Add vc-dir-ignore. + 2013-07-28 Xue Fuqiao <xfq.free@gmail.com> * glossary.texi (Glossary): Add some entries. diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index e2d0b0eebf6..85171fcaa5a 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -798,6 +798,7 @@ Version Control * Old Revisions:: Examining and comparing old versions. * VC Change Log:: Viewing the VC Change Log. * VC Undo:: Canceling changes before or after committing. +* VC Ignore:: Ignore files under version control system. * VC Directory Mode:: Listing files managed by version control. * Branches:: Multiple lines of development. @ifnottex diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 6184684fbb0..553375442d5 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1,4 +1,4 @@ -@c This is part of the Emacs manual. +@c This is part of the Emacs manual., Abbrevs, This is part of the Emacs manual., Top @c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2013 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @@ -56,6 +56,7 @@ variable @code{vc-handled-backends} to @code{nil} * Old Revisions:: Examining and comparing old versions. * VC Change Log:: Viewing the VC Change Log. * VC Undo:: Canceling changes before or after committing. +* VC Ignore:: Ignore files under version control system. * VC Directory Mode:: Listing files managed by version control. * Branches:: Multiple lines of development. @ifnottex @@ -1032,6 +1033,23 @@ unlocked; you must lock again to resume editing. You can also use @kbd{C-x v u} to unlock a file if you lock it and then decide not to change it. +@node VC Ignore +@subsection Ignore Version Control Files + +@table @kbd +@item C-x v G +Ignore a file under current version control system. (@code{vc-ignore}). +@end table + +@kindex C-x v G +@findex vc-ignore + Many source trees contain some files that do not need to be versioned, +such as editor backups, object or bytecode files, and built programs. +You can simply not add them, but then they’ll always crop up as +unknown files. You can also tell the version control system to ignore +these files by adding them to the ignore file at the top of the tree. +@kbd{C-x v G} (@code{vc-ignore}) can help you do this. + @node VC Directory Mode @subsection VC Directory Mode @@ -1222,7 +1240,7 @@ Revisions}), and @w{@kbd{C-x v u}} (@pxref{VC Undo}). The VC Directory buffer also defines some single-key shortcuts for VC commands with the @kbd{C-x v} prefix: @kbd{=}, @kbd{+}, @kbd{l}, -@kbd{i}, @kbd{D}, @kbd{L} and @kbd{v}. +@kbd{i}, @kbd{D}, @kbd{L}, @kbd{G} and @kbd{v}. For example, you can commit a set of edited files by opening a VC Directory buffer, where the files are listed with the @samp{edited} |