From 2d6df3dfddf91f14d019015d7cedbac82f1b0aab Mon Sep 17 00:00:00 2001 From: Mm2PL Date: Tue, 1 Aug 2023 22:25:01 +0200 Subject: [PATCH 1/3] Add .git-blame-ignore-revs --- .git-blame-ignore-revs | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000000..db26c5c96ba --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,11 @@ +# If a commit modifies a ton of files and doesn't really contribute to the +# output of git-blame, please add it here +# +# Don't add commits from the same PR you are creating. We squash PRs into a +# single commit, so references to those commits will be lost +# +# 2018 - added brace wrapping after if and for +e259b9e39f46f3cb0e4838c988d4f320a03dfaa4 +# +# 2019 - Normalize line endings in already existing files +b06eb9df835c25154899fbcf43e9b37addcea1b1 From 21174b562f5b64b3776d8803a859d076a1fb772c Mon Sep 17 00:00:00 2001 From: Mm2PL Date: Tue, 1 Aug 2023 22:31:10 +0200 Subject: [PATCH 2/3] Add readme comment --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 47986f53414..8a6ed222723 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,18 @@ git submodule update --init --recursive [Building on FreeBSD](../master/BUILDING_ON_FREEBSD.md) +## Git blame + +This project has big commits in the history which for example update all line +endings. To improve the output of git-blame, consider setting: + +``` +git config blame.ignoreRevsFile .git-blame-ignore-revs +``` + +This will ignore all revisions mentioned in the [`.git-blame-ignore-revs` +file](./.git-blame-ignore-revs). GitHub does this by default. + ## Code style The code is formatted using clang format in Qt Creator. [.clang-format](src/.clang-format) contains the style file for clang format. From 860d5138a1f6bca8be03c2ee887f0308eb3a209f Mon Sep 17 00:00:00 2001 From: Mm2PL Date: Tue, 1 Aug 2023 23:01:56 +0200 Subject: [PATCH 3/3] Add "changed to 80 max column" --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index db26c5c96ba..e5ae6a09763 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -4,6 +4,9 @@ # Don't add commits from the same PR you are creating. We squash PRs into a # single commit, so references to those commits will be lost # +# 2018 - changed to 80 max column +f71ff08e686ae76c3dd4084d0f05f27ba9b3fdcb +# # 2018 - added brace wrapping after if and for e259b9e39f46f3cb0e4838c988d4f320a03dfaa4 #