Skip to content

Git blame ignore recent formatting commit #136790

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Feb 10, 2025

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Feb 9, 2025

This ignores the commit 1fcae03 from #136751 that applied updating formatting changes.

@rustbot
Copy link
Collaborator

rustbot commented Feb 9, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 9, 2025
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 9, 2025

📌 Commit 9a73f5a has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 9, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Feb 10, 2025
…=compiler-errors

Git blame ignore recent formatting commit

This ignores the commit 1fcae03 from rust-lang#136751 that applied updating formatting changes.
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang#134626 (Add Four Codegen Tests)
 - rust-lang#136053 (coverage: Defer part of counter-creation until codegen)
 - rust-lang#136228 (Simplify Rc::as_ptr docs + typo fix)
 - rust-lang#136487 (ci: stop mysql before removing it)
 - rust-lang#136790 (Git blame ignore recent formatting commit)
 - rust-lang#136803 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang#134626 (Add Four Codegen Tests)
 - rust-lang#136053 (coverage: Defer part of counter-creation until codegen)
 - rust-lang#136228 (Simplify Rc::as_ptr docs + typo fix)
 - rust-lang#136487 (ci: stop mysql before removing it)
 - rust-lang#136790 (Git blame ignore recent formatting commit)
 - rust-lang#136803 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
…kingjubilee

Rollup of 12 pull requests

Successful merges:

 - rust-lang#136053 (coverage: Defer part of counter-creation until codegen)
 - rust-lang#136201 (Removed dependency on the field-offset crate, alternate approach)
 - rust-lang#136228 (Simplify Rc::as_ptr docs + typo fix)
 - rust-lang#136353 (fix(libtest): Enable Instant on Emscripten targets)
 - rust-lang#136472 ([`compiletest`-related cleanups 2/7] Feed stage number to compiletest directly)
 - rust-lang#136487 (ci: stop mysql before removing it)
 - rust-lang#136552 (Use an `Option` for `FindNextFileHandle` in `ReadDir` instead of `INVALID_FILE_HANDLE` sentinel value)
 - rust-lang#136705 (Some miscellaneous edition-related library tweaks)
 - rust-lang#136707 (Bump `cc` to v1.2.13 for the compiler workspace)
 - rust-lang#136790 (Git blame ignore recent formatting commit)
 - rust-lang#136792 (Don't apply editorconfig to llvm)
 - rust-lang#136805 (ignore win_delete_self test in Miri)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a39b275 into rust-lang:master Feb 10, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 10, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
Rollup merge of rust-lang#136790 - ehuss:ignore-rustfmt-2024-again, r=compiler-errors

Git blame ignore recent formatting commit

This ignores the commit 1fcae03 from rust-lang#136751 that applied updating formatting changes.
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants