Documentation/git-merge-tree.adoc: clarify the --merge-base option

[newren]

No description provided.

[dscho]

Ah, the usual Meson failures, and of course without any useful information (which probably was in D:\a\git\git\build\meson-logs\testlog.txt and has long ago gone 💥):

------------------------------------- 8< -------------------------------------
stderr:

(test program exited with status code 1)
------------------------------------------------------------------------------


Summary of Failures:

 95/102 t8020-last-modified                            ERROR          16.09s   exit status 1

Ok:                82  
Fail:              1   
Skipped:           19  

Full log written to D:\a\git\git\build\meson-logs\testlog.txt
Error: Process completed with exit code 1.

Back when the idea was still to use CMake as the next build system, we did not have such unhelpful CI failures.

Will re-run, 🤞that it will "magically succeed" now.

[dscho]

I guess the original wording is on me. Sorry.

[newren]

Back when the idea was still to use CMake as the next build system, we did not have such unhelpful CI failures.

Thanks for digging into this for me.

Will re-run, 🤞that it will "magically succeed" now.

Thanks, looks like it didn't work but since this is just a documentation change that couldn't cause those build failures, I think I'll just ignore it...

I guess the original wording is on me. Sorry.

From blame, 2 of the 3 commits that led to the current wording was from Kyle Zhao (and most of the text was from those 2 commits), leaving only 1 to you. Regardless of what blame says, though, I was the reviewer of all three commits on the mailing list, so it's much more on me than on you.

[newren]

/submit

[gitgitgadget]

Submitted as [email protected]

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1980/newren/merge-tree-merge-base-clarifications-v1

To fetch this version to local tag pr-1980/newren/merge-tree-merge-base-clarifications-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1980/newren/merge-tree-merge-base-clarifications-v1

[gitgitgadget]

This patch series was integrated into seen via git@8d41f61.

[gitgitgadget]

This branch is now known as en/doc-merge-tree-describe-merge-base.

[gitgitgadget]

This patch series was integrated into seen via git@eed6af7.

[gitgitgadget]

This patch series was integrated into seen via git@cdc1761.

[gitgitgadget]

This patch series was integrated into next via git@787ff6f.

[gitgitgadget]

There was a status update in the "New Topics" section about the branch en/doc-merge-tree-describe-merge-base on the Git mailing list:

Clarify the "--merge-base" command line option in "git merge-tree".

Will merge to 'master'.
source: <[email protected]>