Fix gitignore
This commit is contained in:
parent
369984b0d5
commit
bee9e1efe2
1 changed files with 4 additions and 23 deletions
27
.gitignore
vendored
27
.gitignore
vendored
|
@ -3,30 +3,8 @@
|
|||
*.pid
|
||||
*.tmp
|
||||
*.secret
|
||||
<<<<<<< HEAD
|
||||
|
||||
# TODO: should be unnecessary once color generation is homegrown
|
||||
/colors/gen/vendor
|
||||
/colors/gen/tmp
|
||||
|
||||
# keep the pipelines but hide their results
|
||||
/bin/pipelines/*/*/*
|
||||
|
||||
# a place to keep secrets per-env
|
||||
/env/*/.hidden
|
||||
|
||||
# ... and a place to keep shared secrets
|
||||
/env/.hidden
|
||||
||||||| 0d0e131
|
||||
/.repositories
|
||||
/.env/
|
||||
=======
|
||||
fishd.tmp.*
|
||||
|
||||
# TODO: should be unnecessary once color generation is homegrown
|
||||
/colors/gen/vendor
|
||||
/colors/gen/tmp
|
||||
|
||||
# keep the pipelines but hide their results
|
||||
/bin/pipelines/*/*/*
|
||||
|
||||
|
@ -35,4 +13,7 @@ fishd.tmp.*
|
|||
|
||||
# ... and a place to keep shared secrets
|
||||
/env/.hidden
|
||||
>>>>>>> master
|
||||
|
||||
# TODO: should be unnecessary once color generation is homegrown
|
||||
/colors/gen/vendor
|
||||
/colors/gen/tmp
|
||||
|
|
Reference in a new issue