diff options
| -rw-r--r-- | doc/emacs/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 133ab83e2fb..6cf28dc095c 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | 2013-06-02 Xue Fuqiao <xfq.free@gmail.com> | 1 | 2013-06-02 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 2 | ||
| 3 | * maintaining.texi (Branches): Add motivations for branching. | 3 | * maintaining.texi (Branches): Add motivations for branching. |
| 4 | (VC Mode Line): Fix typo. | ||
| 5 | (VC Directory Commands): Mention `vc-dir-hide-up-to-date' with | ||
| 6 | prefix argument. | ||
| 4 | 7 | ||
| 5 | 2013-06-01 Glenn Morris <rgm@gnu.org> | 8 | 2013-06-01 Glenn Morris <rgm@gnu.org> |
| 6 | 9 | ||
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 6a1f049325f..17c04fe74e3 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -379,7 +379,7 @@ merge-based version control system, a @samp{-} character indicates | |||
| 379 | that the work file is unmodified, and @samp{:} indicates that it has | 379 | that the work file is unmodified, and @samp{:} indicates that it has |
| 380 | been modified. @samp{!} indicates that the file contains conflicts as | 380 | been modified. @samp{!} indicates that the file contains conflicts as |
| 381 | result of a recent merge operation (@pxref{Merging}), or that the file | 381 | result of a recent merge operation (@pxref{Merging}), or that the file |
| 382 | was removed from the version control. Finally, @samp{?} means that | 382 | was removed from the version control. Finally, @samp{?} means that |
| 383 | the file is under version control, but is missing from the working | 383 | the file is under version control, but is missing from the working |
| 384 | tree. | 384 | tree. |
| 385 | 385 | ||
| @@ -1203,7 +1203,8 @@ files and directories. | |||
| 1203 | 1203 | ||
| 1204 | @item x | 1204 | @item x |
| 1205 | Hide files with @samp{up-to-date} status | 1205 | Hide files with @samp{up-to-date} status |
| 1206 | (@code{vc-dir-hide-up-to-date}). | 1206 | (@code{vc-dir-hide-up-to-date}). With a prefix argument, hide items |
| 1207 | that are in state of item at point from display. | ||
| 1207 | @end table | 1208 | @end table |
| 1208 | 1209 | ||
| 1209 | @findex vc-dir-mark | 1210 | @findex vc-dir-mark |