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.

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

pick-to-branch: Allow cherry-picking multiple commits at once #100

Closed
wants to merge 4 commits into from
Closed

pick-to-branch: Allow cherry-picking multiple commits at once #100

wants to merge 4 commits into from

Conversation

t8m
Copy link
Member

@t8m t8m commented Nov 22, 2021 •
edited

This can be quite handy when merging multiple-commit PRs to release branches.

@DDvO DDvO mentioned this pull request Nov 22, 2021
Closed
DDvO
DDvO reviewed Nov 22, 2021
View reviewed changes
Copy link
Contributor

@DDvO DDvO left a comment

Choose a reason for hiding this comment

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

Good to allow multiple commits.
Yet why not using the technique done for ghmerge, such as

git cherry-pick FETCH_HEAD~$ncommits..FETCH_HEAD

@t8m
Copy link
Member Author

t8m commented Nov 23, 2021

@DDvO fixup pushed

DDvO
DDvO suggested changes Nov 23, 2021
View reviewed changes
review-tools/pick-to-branch Show resolved Hide resolved
review-tools/pick-to-branch Show resolved Hide resolved
review-tools/pick-to-branch Outdated Show resolved Hide resolved
DDvO
DDvO suggested changes Nov 23, 2021
View reviewed changes
Copy link
Contributor

@DDvO DDvO left a comment

Choose a reason for hiding this comment

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

Feature confirmed to work fine.
One more suggestion, for improved diagnostics.

review-tools/pick-to-branch Outdated Show resolved Hide resolved
DDvO
DDvO approved these changes Nov 24, 2021
View reviewed changes
Copy link
Contributor

@DDvO DDvO left a comment

Choose a reason for hiding this comment

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

LGTM

@DDvO
Copy link
Contributor

DDvO commented Nov 26, 2021

This can be merged.
Unfortunately, as a Committer, I can neither manage labels etc. nor merge in this repo.

openssl-machine pushed a commit that referenced this pull request Nov 26, 2021
@t8m
pick-to-branch: Allow cherry-picking multiple commits at once
dbfd886 
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from #100)
@t8m
Copy link
Member Author

t8m commented Nov 26, 2021

Merged. Thank you for the reviews and comments.

@t8m t8m closed this Nov 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DDvO DDvO DDvO approved these changes

@paulidale paulidale paulidale approved these changes

Assignees
No one assigned
Labels
ready
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@t8m @DDvO @paulidale