mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 20:32:00 -08:00
Code Issues Projects Releases Wiki Activity

; Fix `(emacs)Merge Bases'

Browse source 
Intended to be included in previous commit.
This commit is contained in:
Sean Whitton 2025-08-30 15:54:32 +01:00
parent af4a5e2b4a
commit 8a284cbbc5
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/emacs/vc1-xtra.texi
View file

@ -247,20 +247,13 @@ another (@code{vc-log-mergebase}).
@c more than one branch for older VCS? This needs thinking through if
@c any of our centalized VCS gain support for these commands.
The @dfn{merge base} of two branches is the most recent revision that
exists on both branches. If neither of the branches were ever merged
exists on both branches. If neither of the branches was ever merged
into the other (@pxref{Merging}), then the merge base is the revision
that the older of the two branches was at when the newer branch was
created from it (@pxref{Creating Branches}). If one of the branches was
ever merged into the other, then the merge base is the most recent merge
point.
With this understood, we can generalize the concept of a merge base from
branches to any two revisions. The merge base of two revisions is the
most recent revision that can be found in the revision history of both
of the two revisions.@footnote{In fact the concept generalizes to any
number of revisions, but Emacs's commands for merge bases work with only
two, so we limit ourselves to that.}
The commands described in this section are currently implemented only
for decentralized version control systems (@pxref{VCS Repositories}).