Skip to content

Commit

Permalink
Merge branch 'V3/develop' into V3/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Flame442 authored Dec 23, 2023
2 parents 103429c + 3fd0afd commit d958863
Show file tree
Hide file tree
Showing 1,193 changed files with 221,141 additions and 142,789 deletions.
40 changes: 40 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Since version 2.23 (released in August 2019), git-blame has a feature
# to ignore or bypass certain commits.
#
# 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

# [V3] Update code standards (black code format pass) (#1650)
b88b5a2601f56bda985729352d24842f087a8ade

# Black tests and setup.py (#1657)
e01cdbb0912387749d9459e1d934f9ed393a9b51

# Black formatting for generate_strings.py and docs/conf.py (#1658)
1ecaf6f8d5f2af731bec3eb6ad3a9721ab7a2812

# [V3 Travis] Update travis to not skip pipfile lock... (#1678)
# additional black formatting pass to conform to black 18.5b
d3f406a34a5cae6ea63664e76e8e74be43f9949f

# [V3] Update black version and reformat (#1745)
14cc701b25cea385fd0d537cdb6475d341c017c5

# [V3] Clean up some ugly auto-formatted strings (#1753)
622382f42588ac1d8a52bd3e39bf171c89ff0224

# [CI] Improve automated checks (#2702)
16443c8cc0c24cbc5b3dc7de858edb71b9ca6cd3

# Bump black to 20.8b1 (and reformat) (#4371)
85afe19455f91af21a0f603705eeb5d9599b45cc

# Reformat with Black 22.1.0 (#5633)
c69e8d31fdadbe10230ec0ea2ef35402e5c4cf43

# Reformat with Black 2023 formatting changes
226d8d734de43e1d5ea96a528a8e480641604db1
2 changes: 2 additions & 0 deletions .git_archive_info.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
$Format:%h$
$Format:%(describe:tags=true)$
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@

# binary file excludsions
*.png binary

# include commit/tag information in `.git_archive_info.txt` when packing with git-archive
.git_archive_info.txt export-subst

# hide diffs for .po files by default
# https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
*.po linguist-generated
Loading

0 comments on commit d958863

Please sign in to comment.