diff options
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.clang-format b/.clang-format index 2d412db269..d3ff1260db 100644 --- a/.clang-format +++ b/.clang-format @@ -1,18 +1,18 @@ # This configuration file can be used to auto-format the code base. # Not all guidelines specified in CODING_STYLE are followed, so the # result MUST NOT be committed indiscriminately, but each automated -# change should be reviewed and only the appropriate ones commited. +# change should be reviewed and only the appropriate ones can be commited. # # The easiest way to apply the formatting to your changes ONLY, # is to use the git-clang-format script (usually installed with clang-format). # -# - Fixup formatting before committing +# - Fix up formatting before committing # 1. Edit and stage your files. # 2. Run `git clang-format`. # 3. Verify + correct + (un)stage changes. # 4. Commit. # -# - Fixup formatting after committing +# - Fix up formatting after committing # 1. Commit your changes. # 2. Run `git clang-format HEAD~` - Refer the commit *before* your changes here. # 3. Verify + correct changes, `git difftool -d` can help here. |