From bb25dd81e3d909299092fce7adda05cc6f35dee2 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Mon, 18 Jul 2022 15:02:32 +0100
Subject: [PATCH] Prevent #3679 from appearing in blame results (#13311)

---
 .git-blame-ignore-revs | 13 +++++++++++++
 changelog.d/13311.misc |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 changelog.d/13311.misc

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 50d28c68ee..c3638c35eb 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,16 @@
+# Commits in this file will be removed from GitHub blame results.
+#
+# To use this file locally, use:
+#   git blame --ignore-revs-file="path/to/.git-blame-ignore-revs" <files>
+#
+# or configure the `blame.ignoreRevsFile` option in your git config.
+#
+# If ignoring a pull request that was not squash merged, only the merge
+# commit needs to be put here. Child commits will be resolved from it.
+
+# Run black (#3679).
+8b3d9b6b199abb87246f982d5db356f1966db925
+
 # Black reformatting (#5482).
 32e7c9e7f20b57dd081023ac42d6931a8da9b3a3
 
diff --git a/changelog.d/13311.misc b/changelog.d/13311.misc
new file mode 100644
index 0000000000..4be81c675c
--- /dev/null
+++ b/changelog.d/13311.misc
@@ -0,0 +1 @@
+Prevent formatting changes of [#3679](https://github.com/matrix-org/synapse/pull/3679) from appearing in `git blame`.
\ No newline at end of file