comparison doc/emacs/maintaining.texi @ 107956:69dc127ae6ba

* maintaining.texi (VC Directory Commands): Mention stashes and shelves.
author Glenn Morris <rgm@gnu.org>
date Thu, 15 Apr 2010 19:35:59 -0700
parents 5400dec7bad5
children 23736de70902
comparison
equal deleted inserted replaced
107955:7a4683b66110 107956:69dc127ae6ba
1145 1145
1146 @kbd{M-s a C-s} does an incremental search on the marked files. 1146 @kbd{M-s a C-s} does an incremental search on the marked files.
1147 1147
1148 @kbd{M-s a C-M-s} does an incremental search on the marked files. 1148 @kbd{M-s a C-M-s} does an incremental search on the marked files.
1149 1149
1150 Commands are also accessible from the VC-dir menu. Note that some VC 1150 @cindex stashes in version control
1151 backends use the VC-dir menu to make available extra backend specific 1151 @cindex shelves in version control
1152 commands. 1152 Commands are also accessible from the VC-dir menu. Note that some
1153 VC backends use the VC-dir menu to make available extra,
1154 backend-specific, commands. For example, Git and Bazaar allow you to
1155 manipulate @dfn{stashes} and @dfn{shelves}. (These provide a
1156 mechanism to temporarily store uncommitted changes somewhere out of
1157 the way, and bring them back at a later time.)
1153 1158
1154 Normal VC commands with the @kbd{C-x v} prefix work in VC directory 1159 Normal VC commands with the @kbd{C-x v} prefix work in VC directory
1155 buffers. Some single-key shortcuts are available as well; @kbd{=}, 1160 buffers. Some single-key shortcuts are available as well; @kbd{=},
1156 @kbd{+}, @kbd{l}, @kbd{i}, and @kbd{v} behave as through prefixed with 1161 @kbd{+}, @kbd{l}, @kbd{i}, and @kbd{v} behave as through prefixed with
1157 @kbd{C-x v}. 1162 @kbd{C-x v}.