Skip to content

Commit 6a98157

Browse files
authored
Merge pull request #514 from github/aeisenberg/first-changelog-entry
Add the first changelog entry
2 parents 06b386a + 7ae8d16 commit 6a98157

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
11
lib/*.js linguist-generated=true
2+
3+
# Reduce incidence of needless merge conflicts on CHANGELOG.md
4+
# The man page at
5+
# https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gitattributes.html
6+
# suggests that this might interleave lines arbitrarily, but empirically
7+
# it keeps added chunks contiguous
8+
CHANGELOG.md merge=union

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# CodeQL Action and CodeQL Runner Changelog
22

33
## [UNRELEASED]
4+
5+
- Add this changelog file. [#507](https://github.com/github/codeql-action/pull/507)

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
This action runs GitHub's industry-leading static analysis engine, CodeQL, against a repository's source code to find security vulnerabilities. It then automatically uploads the results to GitHub so they can be displayed in the repository's security tab. CodeQL runs an extensible set of [queries](https://github.com/github/codeql), which have been developed by the community and the [GitHub Security Lab](https://securitylab.github.com/) to find common vulnerabilities in your code.
44

5+
For a list of recent changes, see the CodeQL Action's [changelog](CHANGELOG.md).
6+
57
## License
68

79
This project is released under the [MIT License](LICENSE).

0 commit comments

Comments
 (0)