aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/maintaining.texi17
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 12770f218ca..ea7b8794bbc 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -572,6 +572,23 @@ then applies the changes to the respective files and commits the changes
572after popping up the @file{*vc-log*} buffer to allow you to type a 572after popping up the @file{*vc-log*} buffer to allow you to type a
573suitable commit log message. 573suitable commit log message.
574 574
575Once you type @kbd{C-x v v}, the fileset or patches cannot be changed
576without first cancelling the commit by typing @kbd{C-c C-k} in the
577@file{*vc-log*} buffer. For example, if you change which files are
578marked in the @file{*vc-dir*} buffer after Emacs has already popped up
579the @file{*vc-log*} buffer, the old fileset will remain in effect for
580this commit. (This is in contrast to changes made to the
581@emph{contents} of files in the fileset: all such changes will be
582included in the commit even if they are made after Emacs has popped up
583the @file{*vc-dir*} buffer.)
584
585When you cancel a commit, Emacs saves your log message. This means that
586if you need to adjust the fileset or patches, it is easy to restart the
587commit operation again: type @w{@kbd{C-c C-k C-x v v M-p}}. Here
588@kbd{C-c C-k} cancels the commit, @kbd{C-x v v} initiates another with
589the new fileset or patches, and finally @kbd{M-p} recalls your previous
590log message.
591
575With modern decentralized version control systems (Git, Mercurial, 592With modern decentralized version control systems (Git, Mercurial,
576etc.), the changes are committed locally and not automatically 593etc.), the changes are committed locally and not automatically
577propagated to the upstream repository (which is usually on a remote 594propagated to the upstream repository (which is usually on a remote