Skip to content
This repository has been archived by the owner on May 11, 2022. It is now read-only.

Commit

Permalink
update ignore files
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilsk committed Sep 5, 2018
1 parent b4ae392 commit b30a2be
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 30 deletions.
26 changes: 13 additions & 13 deletions .dockerignore
@@ -1,16 +1,16 @@
docs
env
/docs
/env

.github
.dockerignore
.gitattributes
.gitignore
.goreleaser.yml
.scrutinizer.yml
.travis.yml
/.github
/.dockerignore
/.gitattributes
/.gitignore
/.goreleaser.yml
/.scrutinizer.yml
/.travis.yml

Makefile
Gopkg.*
*_test.go
/Makefile
/Gopkg.*

README.md
*.md
*_test.go
41 changes: 27 additions & 14 deletions .gitattributes
@@ -1,14 +1,27 @@
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
.github export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.goreleaser.yml export-ignore
.travis.yml export-ignore

/docs/ export-ignore
/env/ export-ignore
/makes/ export-ignore
/Makefile export-ignore

*.md export-ignore
*_test.go export-ignore
/docs export-ignore
/env export-ignore

/.github export-ignore
/.dockerignore export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.goreleaser.yml export-ignore
/.scrutinizer.yml export-ignore
/.travis.yml export-ignore

/Makefile export-ignore
/Gopkg.* export-ignore

*.md export-ignore
*_test.go export-ignore

/docs/* -diff -merge
/docs/* linguist-generated=true
*_easyjson.go -diff -merge
*_easyjson.go linguist-generated=true
*.pb.go -diff -merge
*.pb.go linguist-generated=true
bindata.go -diff -merge
bindata.go linguist-generated=true
mock_*_test.go -diff -merge
mock_*_test.go linguist-generated=true
2 changes: 0 additions & 2 deletions .gitignore
Expand Up @@ -2,8 +2,6 @@
*.out

# database
/static/migrations/*
!/static/migrations/1_initial.sql
/env/backup.db

# environment
Expand Down
2 changes: 1 addition & 1 deletion env/tools.mk
Expand Up @@ -18,7 +18,7 @@ json:

.PHONY: mocks
mocks:
find . -name "mock_*.go" | grep -v ./vendor | xargs rm || true
find . -name "mock_*_test.go" | grep -v ./vendor | xargs rm || true
go generate -run="mockgen" ./...

.PHONY: protobuf
Expand Down

0 comments on commit b30a2be

Please sign in to comment.