diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..023ebd2e69 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,23 @@ +# This file contains a list of commits that are not likely what you +# are looking for in a blame, such as mass reformatting or renaming. +# You can set this file as a default ignore file for blame by running +# the following command. +# +# $ git config blame.ignoreRevsFile .git-blame-ignore-revs + +# Apply fixes from StyleCI +77c531527c0bf218038f8349e81f50d5386739a6 +82f43cb98dbe25d6e6fea4e787fa26aca898e41d +29f45ca352a8c5d5c308f93ce1240b7fdfc1c936 + +# Fix coding style part 2 +d8693f05ae4d9ec884cd2c2d850e7f78ba9dc2ae + +# Merge pull request #1449 from job/coding_style_old_files2 +61b14557ce45f8c6d90482075464aad1fae5e209 + +# Merge pull request #1444 from job/coding_style_old_files2 +4ebabc634ab098d4f9721ea7f357baf029a6bf9c + +# Merge pull request #1431 from job/coding_style_old_files +89206b393978d8b42e3755698ca5542be7277270 diff --git a/.gitignore b/.gitignore index 79ed8e7115..ce3585ca2c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ####################### .* !/.gitignore +!/.git-blame-ignore-revs !/.editorconfig !/.scrutinizer.yml !/.php_cs