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

Rustup #5587

Merged
merged 5 commits into from
May 13, 2020
Merged

Rustup #5587

merged 5 commits into from
May 13, 2020

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented May 11, 2020

Done with

git subtree push -P src/tools/clippy [email protected]:flip1995/rust-clippy rustup

from https://github.com/flip1995/rust/tree/clippyup

A rebase was required to get rid of empty merge commits, that somehow were not empty? 🤔

changelog: none

Re-remove util/dev file
@flip1995 flip1995 changed the title [DNM] Rustup Rustup May 11, 2020
@flip1995 flip1995 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label May 11, 2020
@phansch
Copy link
Member

phansch commented May 13, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented May 13, 2020

📌 Commit eec17d2 has been approved by phansch

@bors
Copy link
Collaborator

bors commented May 13, 2020

⌛ Testing commit eec17d2 with merge b20a9cd...

@bors
Copy link
Collaborator

bors commented May 13, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: phansch
Pushing b20a9cd to master...

@bors bors merged commit b20a9cd into rust-lang:master May 13, 2020
This was referenced May 15, 2020
bors added a commit that referenced this pull request May 17, 2020
Rustup with git subtree

The commits from the last rustup #5587, are again included in this rustup, since I rebased the rustup. Lesson learned: never rebase, only merge when working with git subtree.

changelog: none
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants