Skip to content

Commit 23973b8

Browse files
authored
Update clang-format.yml (#216)
1 parent 3025984 commit 23973b8

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/clang-format.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@ jobs:
4343
-c color.diff.whitespace='red reverse' \
4444
clang-format-15 --diff --binary clang-format-15 --commit $PR_BASE -- include/ lib/ || \
4545
(echo "Please run the following git-clang-format locally to fix the formatting: \n
46-
git clang-format origin/main -- include/ lib/" && exit 1)
46+
git-clang-format HEAD~\n
47+
for multiple commits we should place the formatting changes in the related commit with:\n
48+
\t\tgit rebase -i -x \"git-clang-format-15 main && git commit -a --allow-empty --fixup=HEAD\" --strategy-option=theirs origin/main\n
49+
\t\t Then inspect the results with: git log --oneline\n
50+
\t\t Then squash without poluting the history with: git rebase --autosquash -i main\n" && exit 1)

0 commit comments

Comments
 (0)