aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Whitton2025-08-30 15:54:32 +0100
committerSean Whitton2025-08-30 15:54:32 +0100
commit8a284cbbc588d19d48ffbd159dfa506da468e351 (patch)
tree0afd57eed761c60bc4e73dc5897ff21e7bb63920
parentaf4a5e2b4ad080ad5d3b714286e7aca9339288b0 (diff)
downloademacs-8a284cbbc588d19d48ffbd159dfa506da468e351.tar.gz
emacs-8a284cbbc588d19d48ffbd159dfa506da468e351.zip
; Fix `(emacs)Merge Bases'
Intended to be included in previous commit.
-rw-r--r--doc/emacs/vc1-xtra.texi9
1 files changed, 1 insertions, 8 deletions
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index c96f21f0c83..41058aefce5 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -247,20 +247,13 @@ another (@code{vc-log-mergebase}).
247@c more than one branch for older VCS? This needs thinking through if 247@c more than one branch for older VCS? This needs thinking through if
248@c any of our centalized VCS gain support for these commands. 248@c any of our centalized VCS gain support for these commands.
249The @dfn{merge base} of two branches is the most recent revision that 249The @dfn{merge base} of two branches is the most recent revision that
250exists on both branches. If neither of the branches were ever merged 250exists on both branches. If neither of the branches was ever merged
251into the other (@pxref{Merging}), then the merge base is the revision 251into the other (@pxref{Merging}), then the merge base is the revision
252that the older of the two branches was at when the newer branch was 252that the older of the two branches was at when the newer branch was
253created from it (@pxref{Creating Branches}). If one of the branches was 253created from it (@pxref{Creating Branches}). If one of the branches was
254ever merged into the other, then the merge base is the most recent merge 254ever merged into the other, then the merge base is the most recent merge
255point. 255point.
256 256
257With this understood, we can generalize the concept of a merge base from
258branches to any two revisions. The merge base of two revisions is the
259most recent revision that can be found in the revision history of both
260of the two revisions.@footnote{In fact the concept generalizes to any
261number of revisions, but Emacs's commands for merge bases work with only
262two, so we limit ourselves to that.}
263
264The commands described in this section are currently implemented only 257The commands described in this section are currently implemented only
265for decentralized version control systems (@pxref{VCS Repositories}). 258for decentralized version control systems (@pxref{VCS Repositories}).
266 259