Skip to content

scripts: add fwdport/fwdabort.sh for forward porting commits between branches #2597

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 1 commit into from
Jun 3, 2021
Merged

scripts: add fwdport/fwdabort.sh for forward porting commits between branches #2597

merged 1 commit into from
Jun 3, 2021

Conversation

MikeRalphson
Copy link
Member

Improving the bus-factor here also.

As previously run in #2163

The fwdport.sh script will make the following changes to your local repo gitconfig

git config --add rerere.enabled true
git config alias.fwdskip '!git am -i --skip'
git config alias.fwdcont '!git am -i --continue'

Signed-off-by: Mike Ralphson [email protected]

@MikeRalphson MikeRalphson requested a review from webron June 1, 2021 13:50
@MikeRalphson MikeRalphson mentioned this pull request Jun 3, 2021
Closed
@webron webron merged commit 347f361 into OAI:main Jun 3, 2021
char0n pushed a commit to swaggerexpert/OpenAPI-Specification that referenced this pull request Jul 5, 2021
@MikeRalphson @char0n
scripts: add fwdport/fwdabort.sh for forward porting commits between …
8440532 
…branches (OAI#2597)

Signed-off-by: Mike Ralphson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@darrelmiller darrelmiller darrelmiller approved these changes

@webron webron Awaiting requested review from webron

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MikeRalphson @darrelmiller @webron