diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-04-15 19:35:59 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-04-15 19:35:59 -0700 |
| commit | a77fe20c70657b2a3bc057ae3222cbce8973c12d (patch) | |
| tree | f46bfc1b236724a2e2f3d370e7294b2ecccec0a0 | |
| parent | d5b22ab2211ae45e3fa9eb040d394d04e1901c54 (diff) | |
| download | emacs-a77fe20c70657b2a3bc057ae3222cbce8973c12d.tar.gz | |
* maintaining.texi (VC Directory Commands): Mention stashes and shelves.
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 11 | ||||
| -rw-r--r-- | etc/NEWS | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index d68464b1aca..0665133fae2 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -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. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index f8e918ad8e3..56c65852b7a 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -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{=}, @@ -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. --- |