From a7229390c6b8d0cfbedaff284e298d05dd78520d Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Fri, 12 Mar 2021 11:31:25 +0100 Subject: [PATCH 1/2] Update .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 1a23f0ca9a..17b384de13 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,4 @@ # Auto-format the whole project using OCamlformat 75efc08df487fa1a89fb86e446aadc8f6273b5bb +# ocamlformat 0.17.0 +b0c03d1b76f7da7d88d40bbc5029accfa9228112 From bccc7da9776e31fa4b4be3f4b49d987bfc2a0eea Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Fri, 12 Mar 2021 11:43:23 +0100 Subject: [PATCH 2/2] Update ocp-indent config to work better with OCamlformat This only fixes the most annoying case: match clauses. Ocp-indent doesn't offer enough options to fix this problem entirely. --- .ocp-indent | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ocp-indent b/.ocp-indent index e809e8e2ac..157663b78d 100644 --- a/.ocp-indent +++ b/.ocp-indent @@ -1,5 +1,4 @@ normal -max_indent = 2 -strict_with = auto align_ops = false align_params = never +match_clause = 4