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

Catch up jetty-12.0.x with missing PRs #7652

Closed
22 tasks done
joakime opened this issue Feb 24, 2022 · 2 comments
Closed
22 tasks done

Catch up jetty-12.0.x with missing PRs #7652

joakime opened this issue Feb 24, 2022 · 2 comments
Labels
Milestone

Comments

@joakime
Copy link
Contributor

joakime commented Feb 24, 2022

Jetty version(s)
12.0.x

Description

The following PRs that were merged up to jetty-11.0.x are currently missing (or incomplete) from jetty-12.0.x

Check off the ones that you have manually cherry-picked (see comments below for assistance)

@joakime joakime added this to the 12.0.x milestone Feb 24, 2022
@joakime
Copy link
Contributor Author

joakime commented Feb 24, 2022

I've been having luck with cherry-picking these commits from jetty-11.0.x to jetty-12.0.x (while detecting the renamed/moved files) on the command line using ...

git cherry-pick -x --strategy-option="rename-threshold=30" <commit-id> 

You can setup an alias for this, like this one I called cherry-pick-renamed

git config --global alias.cherry-pick-renamed 'cherry-pick -x --strategy-option="rename-threshold=30"'
# used as ...
git cherry-pick-renamed <commit-id>

@joakime
Copy link
Contributor Author

joakime commented Feb 25, 2022

Closing as complete/done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant