Skip to content

git-merge-base: add page #9382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Dec 11, 2022
Merged

git-merge-base: add page #9382

merged 2 commits into from
Dec 11, 2022

Conversation

@Lodifice
Copy link
Contributor

@Lodifice Lodifice commented Oct 27, 2022

  • The page(s) are in the correct platform directories: common, linux, osx, windows, sunos, android, etc.
  • The page(s) have at most 8 examples.
  • The page description(s) have links to documentation or a homepage.
  • The page(s) follow the content guidelines.
  • The PR title conforms to the recommended templates.
  • Version of the command being documented (if known): 2.38.1

@github-actions github-actions bot added the new command Issues requesting creation of a new page or PRs adding a new page for a command. label Oct 27, 2022
@tldr-bot

This comment was marked as outdated.

Sign in to view
@kbdharun kbdharun mentioned this pull request Oct 29, 2022
Open
navarroaxel
navarroaxel reviewed Oct 29, 2022
View reviewed changes
pages/common/git-merge-base.md

`git merge-base {{commit_1}} {{commit_2}}`

- Output all best common ancestors of two commits:
Copy link
Collaborator

@navarroaxel navarroaxel Oct 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

best can only be 1.

Suggested change
- Output all best common ancestors of two commits:
- Print all merge bases for two commits:

Copy link
Contributor Author

@Lodifice Lodifice Oct 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the way git weighs merge bases, there actually can be two "best" ones, which means two of the same quality. But I agree that the wording is confusing, so maybe "all suitable" should be used?

Copy link
Collaborator

@navarroaxel navarroaxel Oct 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

pages/common/git-merge-base.md

- Output all best common ancestors of two commits:

`git merge-base --all {{commit_1}} {{commit_2}}`
Copy link
Collaborator

@navarroaxel navarroaxel Oct 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
`git merge-base --all {{commit_1}} {{commit_2}}`
`git merge-base --all {{commit1}} {{commit2}}`

Copy link
Member

@CleanMachine1 CleanMachine1 Nov 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not commit_hash instead

Copy link
Contributor Author

@Lodifice Lodifice Nov 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the git subcommand pages are not consistent in this matter, but the majority uses just commit.

Copy link
Contributor

@EmilyGraceSeville7cf EmilyGraceSeville7cf Dec 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the git subcommand pages are not consistent in this matter, but the majority uses just commit.

It means that consistency should be fixed. For instance we can write script to do that like in #9578 PR.

@github-actions
Copy link

github-actions bot commented Dec 3, 2022

Hi all! This thread has not had any recent activity.
Are there any updates? Thanks!

@github-actions github-actions bot added the waiting Issues/PRs with Pending response by the author. label Dec 3, 2022
EmilyGraceSeville7cf
EmilyGraceSeville7cf approved these changes Dec 3, 2022
View reviewed changes
Copy link
Contributor

@EmilyGraceSeville7cf EmilyGraceSeville7cf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No unmentioned issues found.
Thanks for a contribution! ❤️

pages/common/git-merge-base.md

- Output all best common ancestors of two commits:

`git merge-base --all {{commit_1}} {{commit_2}}`
Copy link
Contributor

@EmilyGraceSeville7cf EmilyGraceSeville7cf Dec 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the git subcommand pages are not consistent in this matter, but the majority uses just commit.

It means that consistency should be fixed. For instance we can write script to do that like in #9578 PR.

@github-actions github-actions bot removed the waiting Issues/PRs with Pending response by the author. label Dec 4, 2022
@pixelcmtd pixelcmtd merged commit e01871f into tldr-pages:main Dec 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@navarroaxel navarroaxel navarroaxel left review comments

@pixelcmtd pixelcmtd pixelcmtd approved these changes

@SethFalco SethFalco Awaiting requested review from SethFalco

@CleanMachine1 CleanMachine1 Awaiting requested review from CleanMachine1

+1 more reviewer

@EmilyGraceSeville7cf EmilyGraceSeville7cf EmilyGraceSeville7cf approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

new command Issues requesting creation of a new page or PRs adding a new page for a command.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Lodifice @tldr-bot @navarroaxel @pixelcmtd @EmilyGraceSeville7cf @CleanMachine1