-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
.gitignore: Don't ignore a file that exists in the repository #67344
Merged
bors
merged 1 commit into
rust-lang:master
from
joshtriplett:no-gitignore-of-committed-files
Dec 16, 2019
Merged
.gitignore: Don't ignore a file that exists in the repository #67344
bors
merged 1 commit into
rust-lang:master
from
joshtriplett:no-gitignore-of-committed-files
Dec 16, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
.gitignore should not ignore files that exist in the repository. The ignore of .cargo applies to the committed .cargo directory used in an example: $ git ls-files --exclude-standard --ignored src/test/run-make/thumb-none-qemu/example/.cargo/config Explicitly un-ignore that file.
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 16, 2019
@bors r+ rollup |
📌 Commit 00e7ff4 has been approved by |
🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened |
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
Dec 16, 2019
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 16, 2019
…ted-files, r=Dylan-DPC .gitignore: Don't ignore a file that exists in the repository .gitignore should not ignore files that exist in the repository. The ignore of .cargo applies to the committed .cargo directory used in an example: $ git ls-files --exclude-standard --ignored src/test/run-make/thumb-none-qemu/example/.cargo/config Explicitly un-ignore that file.
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 16, 2019
…ted-files, r=Dylan-DPC .gitignore: Don't ignore a file that exists in the repository .gitignore should not ignore files that exist in the repository. The ignore of .cargo applies to the committed .cargo directory used in an example: $ git ls-files --exclude-standard --ignored src/test/run-make/thumb-none-qemu/example/.cargo/config Explicitly un-ignore that file.
bors
added a commit
that referenced
this pull request
Dec 16, 2019
Rollup of 8 pull requests Successful merges: - #67249 (Improve code generated for `starts_with(<literal char>)`) - #67308 (Delete flaky test net::tcp::tests::fast_rebind) - #67318 (Improve typeck & lowering docs for slice patterns) - #67322 (use Self alias in place of macros) - #67323 (make transparent enums more ordinary) - #67336 (Fix JS error when loading page with search) - #67344 (.gitignore: Don't ignore a file that exists in the repository) - #67349 (Minor: update Unsize docs for dyn syntax) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
.gitignore should not ignore files that exist in the repository. The
ignore of .cargo applies to the committed .cargo directory used in an
example:
$ git ls-files --exclude-standard --ignored
src/test/run-make/thumb-none-qemu/example/.cargo/config
Explicitly un-ignore that file.