Skip to content

docs: clarify fork_point is merge-base#9142

Open
9999years wants to merge 1 commit intojj-vcs:mainfrom
9999years:wiggles/wuku
Open

docs: clarify fork_point is merge-base#9142
9999years wants to merge 1 commit intojj-vcs:mainfrom
9999years:wiggles/wuku

Conversation

@9999years
Copy link
Copy Markdown

I was a bit surprised that there wasn't a merge_base function, and more surprised that searching this page for "merge-base" didn't find anything.

Let's add a note here.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added/updated tests to cover my changes
  • I fully understand the code that I am submitting (what it does,
    how it works, how it's organized), including any code drafted by an LLM.
  • For any prose generated by an LLM, I have proof-read and copy-edited with
    an eye towards deleting anything that is irrelevant, clarifying anything
    that is confusing, and adding details that are relevant. This includes,
    for example, commit descriptions, PR descriptions, and code comments.

@9999years 9999years requested a review from a team as a code owner March 18, 2026 16:42
@google-cla
Copy link
Copy Markdown

google-cla bot commented Mar 18, 2026

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@joyously
Copy link
Copy Markdown

Why use a hyphen and quotes?
Why put it so far away from "common ancestor(s) of all commits in x" ?
Who uses the term "merge-base"? Should it be defined somewhere?

@9999years
Copy link
Copy Markdown
Author

@joyously git merge-base is the Git equivalent here, so it's an obvious thing to search for (it's the base of the two commits when merging).

It also comes up in discussion and writing about Git, e.g. this question "How to find the most recent common ancestor of two Git branches?" suggests using the git merge-base command: https://stackoverflow.com/questions/1549146/git-find-the-most-recent-common-ancestor-of-two-branches

@joyously
Copy link
Copy Markdown

Perhaps that should go in the Git comparison page, as I am an example of a user that knew nothing about it.

@martinvonz
Copy link
Copy Markdown
Member

We have this on this page under the x::y operator:

This is what git log calls --ancestry-path x..y"

So perhaps we can use similar language here, i.e. saying that it's what git merge-base calculates? Oh, we should probably also point out that it's not what git merge-base --fork-point does :)

I was a bit surprised that there wasn't a `merge_base` function, and
more surprised that searching this page for "merge-base" didn't find
anything.

Let's add a note here.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants