Skip to content

Conversation

camelid
Copy link
Member

@camelid camelid commented Mar 11, 2021

I got this from a Stack Overflow answer.
(I didn't add *~ because it was already there.)

@camelid camelid added C-enhancement Category: An issue proposing an enhancement or a PR with one. A-meta Area: Issues & PRs about the rust-lang/rust repository itself labels Mar 11, 2021
@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2021
@Mark-Simulacrum
Copy link
Member

Huh. My initial reaction was "this should go in you global .gitignore", but the comment in the file suggests otherwise. I find that an odd comment, but this seems largely harmless. @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 11, 2021

📌 Commit 68f50c8 has been approved by Mark-Simulacrum

@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 Mar 11, 2021
@camelid
Copy link
Member Author

camelid commented Mar 11, 2021

My initial reaction was "this should go in you global .gitignore"

I actually only realized there was such a thing as a global .gitignore when I found that Stack Overflow answer. Before then I assumed that every gitignore had to be local. I suspect other people assume that as well.

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 11, 2021
…Simulacrum

Ignore Vim swap files

I got this from [a Stack Overflow answer][so].
(I didn't add `*~` because it was already there.)

[so]: https://stackoverflow.com/a/4824199
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 11, 2021
…Simulacrum

Ignore Vim swap files

I got this from [a Stack Overflow answer][so].
(I didn't add `*~` because it was already there.)

[so]: https://stackoverflow.com/a/4824199
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 12, 2021
Rollup of 11 pull requests

Successful merges:

 - rust-lang#80385 (Clarify what `Cell::replace` returns)
 - rust-lang#82571 (Rustdoc Json: Add tests for Reexports, and improve jsondocck)
 - rust-lang#82860 (Add `-Z unpretty` flag for the THIR)
 - rust-lang#82950 (convert slice doc link to intra-doc links)
 - rust-lang#82965 (Add spirv extension handling in compiletest)
 - rust-lang#82966 (update MSYS2 link in README)
 - rust-lang#82979 (Fix "run" button position in error index)
 - rust-lang#83001 (Ignore Vim swap files)
 - rust-lang#83003 (rustdoc: tweak the search index format)
 - rust-lang#83013 (Adjust some `#[cfg]`s to take non-Unix non-Windows operating systems into account)
 - rust-lang#83018 (Reintroduce accidentally deleted assertions.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3e6e808 into rust-lang:master Mar 12, 2021
@rustbot rustbot added this to the 1.52.0 milestone Mar 12, 2021
@camelid camelid deleted the gitignore-vim-swap branch March 12, 2021 04:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself C-enhancement Category: An issue proposing an enhancement or a PR with one. 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