Skip to content

Add no-ff merge option. #471

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

Merged
merged 2 commits into from
Dec 22, 2020
Merged

Add no-ff merge option. #471

merged 2 commits into from
Dec 22, 2020

Conversation

hokita
Copy link
Contributor

@hokita hokita commented Jun 13, 2020

Your checklist for this pull request

🚨Please review the guidelines for contributing to this repository.

  • Ensure all commits include DCO sign-off.
  • Ensure that your contributions pass unit testing.
  • Ensure that your contributions contain documentation if applicable.

Description

This PR adds the no-ff merge option.

Signed-off-by: hokita <hideee.0202@gmail.com>
@stale
Copy link

stale bot commented Aug 15, 2020

A friendly reminder that this issue had no activity for 60 days.

@stale stale bot added the stale label Aug 15, 2020
@stale stale bot removed the stale label Dec 22, 2020
Copy link
Member

@jcouball jcouball left a comment

Choose a reason for hiding this comment

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

Looks good! Thank you.

Copy link
Member

@jcouball jcouball left a comment

Choose a reason for hiding this comment

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

Looks good. Thank you!

@jcouball jcouball merged commit 0593e4f into ruby-git:master Dec 22, 2020
@hokita hokita deleted the add_no_ff_merge branch December 23, 2020 00:41
@hokita hokita restored the add_no_ff_merge branch December 23, 2020 00:53
@hokita hokita deleted the add_no_ff_merge branch December 23, 2020 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants