Skip to content

Commit

Permalink
Rollup merge of #67344 - joshtriplett:no-gitignore-of-committed-files…
Browse files Browse the repository at this point in the history
…, 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.
  • Loading branch information
Centril authored Dec 16, 2019
2 parents 13b7399 + 00e7ff4 commit aa84f61
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@ config.mk
config.stamp
Session.vim
.cargo
!/src/test/run-make/thumb-none-qemu/example/.cargo
no_llvm_build
# Before adding new lines, see the comment at the top.

0 comments on commit aa84f61

Please sign in to comment.