Skip to content
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.

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

Polish command line only option descriptions #3279

Closed
wants to merge 14 commits into from

Conversation

matmaer
Copy link

@matmaer matmaer commented Dec 15, 2024

No description provided.

@behrmann
Copy link
Contributor

There's a few commits in here, that shouldn't be. Can you reset the branch to current main and the new changes on top of that? One waymight be

git checkout main
git pull <name for your upstream remote> main
# save this branch under a different name
git branch -m polish-man polish-man_v0
git switch -c polish-man
git cherry-pick --no-commit 282d428 14e610d
git commit -m 'man: polish command line only option descriptions'
git push --force-with-lease <name of your fork> polish-man

mkosi/resources/man/mkosi.1.md Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Outdated Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Outdated Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Outdated Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Show resolved Hide resolved
mkosi/resources/man/mkosi.1.md Show resolved Hide resolved
matmaer and others added 2 commits December 17, 2024 02:28
Sorry for missing the space.
As far as sentences go, generally speaking I think they are too long, but here it doesn't matter much so committing changes.

Co-authored-by: Jörg Behrmann <[email protected]>
agreed

Co-authored-by: Jörg Behrmann <[email protected]>
@matmaer
Copy link
Author

matmaer commented Dec 17, 2024

There's a few commits in here, that shouldn't be. Can you reset the branch to current main and the new changes on top of that? One waymight be

git checkout main
git pull <name for your upstream remote> main
# save this branch under a different name
git branch -m polish-man polish-man_v0
git switch -c polish-man
git cherry-pick --no-commit 282d428 14e610d
git commit -m 'man: polish command line only option descriptions'
git push --force-with-lease <name of your fork> polish-man

I didn't mean to include the previous commits, I tried to avoid this. Even after re-cloning, deleting and re-creating the polish-man branch, which I assumed had another hash, it still showed up. Edit: maybe for the scope of the man page, it's more convenient to just work on the main branch?

thanks!

Co-authored-by: Jörg Behrmann <[email protected]>
@matmaer
Copy link
Author

matmaer commented Dec 17, 2024

There's a few commits in here, that shouldn't be. Can you reset the branch to current main and the new changes on top of that? One waymight be

git checkout main
git pull <name for your upstream remote> main
# save this branch under a different name
git branch -m polish-man polish-man_v0
git switch -c polish-man
git cherry-pick --no-commit 282d428 14e610d
git commit -m 'man: polish command line only option descriptions'
git push --force-with-lease <name of your fork> polish-man

OK trying your suggestion, thanks for the guidance.

matmaer and others added 7 commits December 17, 2024 21:50
correct sentence construction error
Sorry for missing the space.
As far as sentences go, generally speaking I think they are too long, but here it doesn't matter much so committing changes.

Co-authored-by: Jörg Behrmann <[email protected]>
agreed

Co-authored-by: Jörg Behrmann <[email protected]>
thanks!

Co-authored-by: Jörg Behrmann <[email protected]>
@matmaer matmaer closed this Dec 17, 2024
@matmaer matmaer deleted the polish-man branch December 17, 2024 21:23
@matmaer matmaer restored the polish-man branch December 17, 2024 21:23
@matmaer matmaer deleted the polish-man branch December 17, 2024 21:23
@matmaer matmaer restored the polish-man branch December 17, 2024 21:26
@matmaer matmaer reopened this Dec 17, 2024
Copy link
Author

@matmaer matmaer left a comment

Choose a reason for hiding this comment

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

It's weird I did it before but somehow I messed up, please cherry pick on your end. Thanks and hopefully better git flow next time.

@matmaer matmaer closed this Dec 17, 2024
@matmaer matmaer deleted the polish-man branch December 17, 2024 21:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants