Skip to content

Remove ripgrep #1232

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
Mar 24, 2022
Merged

Remove ripgrep #1232

merged 1 commit into from
Mar 24, 2022

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Mar 23, 2022 •
edited
Loading

It was superseded by ripgrep-13.0.0.

@rylev rylev marked this pull request as ready for review March 23, 2022 17:28
@nnethercote
Copy link
Contributor

@rylev You have this "Merge branch 'master' into ripgrep-remove" commit. There was a similar one you added to #1217. I haven't seen this style of updating PRs before, I found it confusing. Is there anything wrong with a normal rebase and repush?

@rylev
Copy link
Member

rylev commented Mar 23, 2022

No, this is what GitHub does when you fix merge conflicts through the GitHub API. We haven't been particularly picky with git history in the past, but I'm more than happy to stop doing this, and rely on rebasing instead (it's just slightly less convenient).

@nnethercote
Copy link
Contributor

Ok, thanks for the info. I was certainly surprised to see commits from others being added to my PR, and I do like version history to be clean where possible, so I have a personal preference for rebasing.

@rylev
Copy link
Member

rylev commented Mar 24, 2022

@nnethercote @Kobzol I've rebased. Sorry for the confusion!

@Kobzol Kobzol enabled auto-merge March 24, 2022 08:55
@Kobzol
Copy link
Contributor Author

Kobzol commented Mar 24, 2022

I tried to use the new "bors-like" auto-merge feature on this PR, let's see how it goes :)

@Kobzol Kobzol merged commit 644319d into master Mar 24, 2022
@Kobzol Kobzol deleted the ripgrep-remove branch March 24, 2022 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nnethercote nnethercote nnethercote approved these changes

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
@Kobzol @nnethercote @rylev