about summary refs log tree commit diff
path: root/.git-blame-ignore-revs
diff options
context:
space:
mode:
authorsternenseemann2024-09-27 11:41:25 +0200
committersternenseemann2024-09-27 11:41:25 +0200
commitb341506a8d18d8d5d47ed4dbb201c8ed04b183d1 (patch)
treeaa477119c53f4d71f3cfceb0f827b92e1c13351b /.git-blame-ignore-revs
parentb6b063bdc265990fb87781682da974578b16443c (diff)
parentfdadb5f0df5d2641c7e4494f4defc31f1e9cb8c0 (diff)
Merge branch master into haskell-updates
Conflicts from #341407 resolved.
Diffstat (limited to '.git-blame-ignore-revs')
-rw-r--r--.git-blame-ignore-revs3
1 files changed, 3 insertions, 0 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 8922ab37e1f5..8a25858cfd6a 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -171,3 +171,6 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9
 
 # nixos/kanidm: inherit lib, nixfmt
 8f18393d380079904d072007fb19dc64baef0a3a
+
+# fetchurl: nixfmt-rfc-style
+ce21e97a1f20dee15da85c084f9d1148d84f853b