aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Whitton2025-07-11 09:29:12 +0100
committerSean Whitton2025-07-11 09:29:12 +0100
commit0814a93a040fffbf9d0be75b1ebdf432c0ce5f3c (patch)
tree2d7375b02974b72a16b3fb2efd051372edefc36e
parent191109e25e51b986e1029b5a5010ced07507a73a (diff)
downloademacs-0814a93a040fffbf9d0be75b1ebdf432c0ce5f3c.tar.gz
emacs-0814a93a040fffbf9d0be75b1ebdf432c0ce5f3c.zip
; Improve manual docs for incoming and outgoing diff commands
-rw-r--r--doc/emacs/maintaining.texi31
1 files changed, 20 insertions, 11 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 895f19453e4..84191490e50 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1085,9 +1085,7 @@ non-@code{nil}, @kbd{C-x v O} becomes a prefix key, and
1085 1085
1086@item M-x vc-root-diff-outgoing 1086@item M-x vc-root-diff-outgoing
1087Display a diff of the changes that will be sent by the next push 1087Display a diff of the changes that will be sent by the next push
1088operation. This command is useful as a way to preview your push and 1088operation.
1089ensure that all and only the changes you intended to include were
1090committed and will be pushed.
1091 1089
1092If you customize @code{vc-use-incoming-outgoing-prefixes} to 1090If you customize @code{vc-use-incoming-outgoing-prefixes} to
1093non-@code{nil}, this command is bound to @kbd{C-x v O D}. 1091non-@code{nil}, this command is bound to @kbd{C-x v O D}.
@@ -1163,16 +1161,27 @@ prompts for the branch whose history to display.
1163@findex vc-log-outgoing 1161@findex vc-log-outgoing
1164 On a decentralized version control system, the @kbd{C-x v I} 1162 On a decentralized version control system, the @kbd{C-x v I}
1165(@code{vc-log-incoming}) command displays a log buffer showing the 1163(@code{vc-log-incoming}) command displays a log buffer showing the
1166changes that will be applied, the next time you run the version 1164changes that will be applied the next time you run the version control
1167control system's pull command to get new revisions from another 1165system's pull command to get new revisions from another remote location
1168remote location (@pxref{Pulling / Pushing}). This other remote location is the default 1166(@pxref{Pulling / Pushing}). This other remote location is the default
1169one from which changes are pulled, as defined by the version control 1167one from which changes are pulled, as defined by the version control
1170system; with a prefix argument, @code{vc-log-incoming} prompts for a 1168system; with a prefix argument, @code{vc-log-incoming} prompts for a
1171specific remote location. Similarly, @kbd{C-x v O} 1169particular remote location. Similarly, @kbd{C-x v O}
1172(@code{vc-log-outgoing}) shows the changes that will be sent to 1170(@code{vc-log-outgoing}) shows the changes that will be sent to another
1173another remote location, the next time you run the push command; with a 1171remote location, the next time you run the push command; with a prefix
1174prefix argument, it prompts for a specific destination that 1172argument, it prompts for a particular destination that in case of some
1175in case of some version control system can be a branch name. 1173version control system can be a branch name.
1174
1175@findex vc-root-diff-incoming
1176@findex vc-root-diff-outgoing
1177 The closely related commands @code{vc-root-diff-incoming} and
1178@code{vc-root-diff-outgoing} are the diff analogues of
1179@code{vc-log-incoming} and @code{vc-log-outgoing}. These display a diff
1180buffer reporting the changes that would be pulled or pushed. You can
1181use a prefix argument here too to specify a particular remote location.
1182@code{vc-root-diff-outgoing} is useful as a way to preview your push and
1183quickly check that all and only the changes you intended to include were
1184committed and will be pushed.
1176 1185
1177@cindex VC log buffer, commands in 1186@cindex VC log buffer, commands in
1178@cindex vc-log buffer 1187@cindex vc-log buffer