Skip to content

Commit

Permalink
Add export-ignore section to .gitattributes + Remove `composer.lo…
Browse files Browse the repository at this point in the history
…ck` from `.gitignore` (#321)
  • Loading branch information
vjik authored Jul 1, 2024
1 parent 0ea080e commit 2557fdd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@
*.gif binary
*.ttf binary

# Ignore some meta files when creating an archive of this repository
/.github export-ignore
/.gitattributes export-ignore
/.styleci.yml export-ignore
/CHANGELOG.md export-ignore
/LICENSE.md export-ignore
/README.md export-ignore
/composer.lock export-ignore

# Avoid merge conflicts in CHANGELOG
# https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
/CHANGELOG.md merge=union
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,3 @@ phpunit.phar

# Codeception
c3.php

# Composer
composer.lock

0 comments on commit 2557fdd

Please sign in to comment.