Skip to content

Commit

Permalink
Update clang-format.yml (#216)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronj0 authored Apr 4, 2024
1 parent 3025984 commit 23973b8
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,8 @@ jobs:
-c color.diff.whitespace='red reverse' \
clang-format-15 --diff --binary clang-format-15 --commit $PR_BASE -- include/ lib/ || \
(echo "Please run the following git-clang-format locally to fix the formatting: \n
git clang-format origin/main -- include/ lib/" && exit 1)
git-clang-format HEAD~\n
for multiple commits we should place the formatting changes in the related commit with:\n
\t\tgit rebase -i -x \"git-clang-format-15 main && git commit -a --allow-empty --fixup=HEAD\" --strategy-option=theirs origin/main\n
\t\t Then inspect the results with: git log --oneline\n
\t\t Then squash without poluting the history with: git rebase --autosquash -i main\n" && exit 1)

0 comments on commit 23973b8

Please sign in to comment.