mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

* maintaining.texi (VC Directory Commands): Mention stashes and shelves.

Browse Source
This commit is contained in:
Glenn Morris 2010-04-15 19:35:59 -07:00
parent d5b22ab221
commit a77fe20c70
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/emacs/ChangeLog
View File

@ -1,3 +1,7 @@
2010-04-16 Glenn Morris <rgm@gnu.org>
* maintaining.texi (VC Directory Commands): Mention stashes and shelves.
2010-04-15 Glenn Morris <rgm@gnu.org>
* dired.texi (Misc Dired Features): Mention VC diff and log.

11
doc/emacs/maintaining.texi
View File

@ -1147,9 +1147,14 @@ directory buffer will be used.
@kbd{M-s a C-M-s} does an incremental search on the marked files.
Commands are also accessible from the VC-dir menu. Note that some VC
backends use the VC-dir menu to make available extra backend specific
commands.
@cindex stashes in version control
@cindex shelves in version control
Commands are also accessible from the VC-dir menu. Note that some
VC backends use the VC-dir menu to make available extra,
backend-specific, commands. For example, Git and Bazaar allow you to
manipulate @dfn{stashes} and @dfn{shelves}. (These provide a
mechanism to temporarily store uncommitted changes somewhere out of
the way, and bring them back at a later time.)
Normal VC commands with the @kbd{C-x v} prefix work in VC directory
buffers. Some single-key shortcuts are available as well; @kbd{=},

2
etc/NEWS
View File

@ -341,12 +341,14 @@ backends do not support this.
**** The short log format for git makes use of the graph display, so
it's not supported on git versions earlier than 1.5.
+++
**** Support for operating with stashes has been added to vc-dir:
the stash list is displayed in the *vc-dir* header, stashes can be
created, removed, applied and their content displayed.
**** vc-dir requires at least git-1.5.5.
+++
*** vc-bzr supports operating with shelves: the shelve list is
displayed in the *vc-dir* header, shelves can be created, removed and applied.
---