From 40a145e15c795f1a8fbd5eb8a97644549f6b7717 Mon Sep 17 00:00:00 2001 From: Piotr Dyraga Date: Mon, 12 Aug 2024 11:54:27 +0200 Subject: [PATCH 1/2] Add commit message rules to CONTRIBUTING Added rules about good commit messages to the CONTRIBUTING.md document. The same rules we have been following so far, so nothing revolutionary. Just to keep the new contributors informed. --- CONTRIBUTING.adoc | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index d92c23f53..5b29fb0ed 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -4,8 +4,7 @@ anyone, and even the smallest of fixes is appreciated! The following is a set of guidelines for contributing to Keep and its packages. -These are mostly guidelines, not rules. Use your best judgment, and feel free to -propose changes to this document in a pull request. +Feel free to propose changes to this document in a pull request. == Getting started @@ -55,3 +54,33 @@ Solidity linting, please propose these changes to our https://github.com/keep-network/solium-config-keep[solium-config-keep] and https://github.com/keep-network/eslint-config-keep[eslint-config-keep] packages. All other packages have it as a dependency. + +== Commit Messages + +When composing commit messages, please follow the general guidelines listed in +[Chris Beams’s How to Write a Git Commit Message](https://cbea.ms/git-commit/). +Many editors have git modes that will highlight overly long first lines of +commit messages, etc. The GitHub UI itself will warn you if your commit summary +is too long, and will auto-wrap commit messages made through the UI to 72 +characters. + +The above goes into good commit style. Some additional guidelines do apply, +however: + +* The target audience of your commit messages is always "some person 10 years + from now who never got a chance to talk to present you" (that person could be + future you!). +* Commit messages with a summary and no description should be very rare. This + means you should probably break any habit of using `git commit -m`. +* A fundamental principle that informs our use of GitHub: assume GitHub will + someday go away, and ensure git has captured all important information about + the development of the code. Commit messages are the piece of knowledge that + is second most likely to survive tool transitions (the first is the code + itself); as such, they must stand alone. Do not reference tickets or issues + in your commit messages. Summarize any conclusions from the issue or ticket + that inform the commit itself, and capture any additional reasoning or context + in the merge commit. +* Make your commits as atomic as you can manage. This means each commit contains + a single logical unit of work. +* Run a quick `git log --graph --all --oneline --decorate` before pushing. + It’s much easier to fix typos and minor mistakes locally. From 9aacfa7a38e2d3d2c7da13f754965e656b4e00b2 Mon Sep 17 00:00:00 2001 From: Piotr Dyraga Date: Mon, 12 Aug 2024 11:56:34 +0200 Subject: [PATCH 2/2] Use proper format for adoc links Fixed a format of a link in the CONTRIBUTING.adoc. --- CONTRIBUTING.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 5b29fb0ed..1c2866943 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -58,7 +58,7 @@ All other packages have it as a dependency. == Commit Messages When composing commit messages, please follow the general guidelines listed in -[Chris Beams’s How to Write a Git Commit Message](https://cbea.ms/git-commit/). +https://cbea.ms/git-commit/[Chris Beams’s How to Write a Git Commit Message]. Many editors have git modes that will highlight overly long first lines of commit messages, etc. The GitHub UI itself will warn you if your commit summary is too long, and will auto-wrap commit messages made through the UI to 72