procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* doc/emacs/maintaining.texi (VC Directory Commands): Copyedit.

Browse source 
(Branches): Put back milder version of pre 2013-06-07 text.
This commit is contained in:
Glenn Morris 2013-06-10 23:42:15 -07:00
parent 56602a4bfc
commit 9102c47ad2
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/emacs/ChangeLog
View file

@ -1,7 +1,11 @@
2013-06-11 Glenn Morris <rgm@gnu.org>
* maintaining.texi (VC Directory Commands): Copyedit.
(Branches): Put back milder version of pre 2013-06-07 text.
2013-06-07 Xue Fuqiao <xfq.free@gmail.com>
* maintaining.texi (Branches): Remove text copied from other
sources.
* maintaining.texi (Branches): Remove text copied from other sources.
2013-06-05 Alan Mackenzie <acm@muc.de>

7
doc/emacs/maintaining.texi
View file

@ -1204,7 +1204,7 @@ files and directories.
@item x
Hide files with @samp{up-to-date} status
(@code{vc-dir-hide-up-to-date}). With a prefix argument, hide items
that are in state of item at point from display.
whose state is that of the item at point.
@end table
@findex vc-dir-mark
@ -1267,7 +1267,10 @@ bring them back at a later time).
@cindex branch (version control)
One use of version control is to support multiple independent lines
of development, which are called @dfn{branches}.
of development, which are called @dfn{branches}. Amongst other
things, branches can be used for maintaining separate ``stable'' and
``development'' versions of a program, and for developing unrelated
features in isolation from one another.
VC's support for branch operations is currently fairly limited. For
decentralized version control systems, it provides commands for