From: Glenn Morris <rgm@gnu.org>
Date: Fri, 16 Apr 2010 02:35:59 +0000 (-0700)
Subject: * maintaining.texi (VC Directory Commands): Mention stashes and shelves.
X-Git-Tag: emacs-pretest-23.1.96~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a77fe20c70657b2a3bc057ae3222cbce8973c12d;p=emacs.git

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

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{=},
diff --git a/etc/NEWS b/etc/NEWS
index 553537efbee..5b65a0d709a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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.
 ---