Skip to content

Commit cfa1cba

Browse files
Igor Milhitjma
Igor Milhit
authored andcommitted
documentation: update commit message template
Co-Authored-by: Igor Milhit <[email protected]>
1 parent 00129d6 commit cfa1cba

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

.gitmessage.txt

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1-
component: title without verbs (less than 50 chars)
1+
# the title begins with a verb, imperative mode
2+
# no trailing dot
3+
component: summarize changes in 50 char or less
24

3-
* NEW Adds your new feature.
4-
* FIX Fixes an existing issue, may closes #issue.
5-
* BETTER Improves and existing feature.
6-
* Changes something that should not be visible in release notes.
5+
# Focus on why you are making this change as opposed to how (the code
6+
# explains that).
7+
# Wrap line at 72 characters. Bullet points list is better, but full
8+
# paragraphs are possible too.
9+
* Adds your new feature.
10+
* Fixes an existing issue, may closes #issue.
11+
* Improves and existing feature.
12+
13+
# No `Signed-off-by` line anymore.
14+
# Multiple `Co-Authored-by` lines are allowed.
15+
Co-Authored-by: [Your Full Name] <[your-email]>
16+
17+
# https://github.com/inveniosoftware/invenio/blob/master/CONTRIBUTING.rst#commit-messages

CONTRIBUTING.rst

+7-9
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ If you are proposing a feature:
7676
Get Started!
7777
------------
7878

79-
Ready to contribute? Here's how to set up `rero-ils` for local development.
79+
Ready to contribute? Here's how to set up ``rero-ils`` for local development.
8080

81-
1. Fork the `rero/rero-ils` repo on GitHub.
81+
1. Fork the ``rero/rero-ils`` repo on GitHub.
8282
2. Clone your fork locally:
8383

8484
.. code-block:: console
@@ -105,28 +105,26 @@ Ready to contribute? Here's how to set up `rero-ils` for local development.
105105
(code style), PEP257 (documentation), flake8 as well as build the Sphinx
106106
documentation and run doctests.
107107

108-
6. Add the `.gitmessage.txt` to your `git` configuration:
108+
6. Add the ``.gitmessage.txt`` file to your ``git`` configuration:
109109

110-
.. code-block::console
110+
.. code-block:: console
111111
112112
# globally
113113
$ git config --global commit.template /path/.gitmessage.txt
114114
115115
# locally
116116
$ git config --local commit.template .gitmessage.txt
117117
118+
The ``Signed-off-by`` message is not used anymore, so you can avoid ``-s``
119+
parameters when committing. But of course, you can modify your own version
120+
of the ``.gitcommit.txt`` in order to add you own ``Co-Authored-by`` message.
118121

119122
7. Commit your changes and push your branch to GitHub:
120123

121124
.. code-block:: console
122125
123126
$ git add .
124127
$ git commit -s
125-
-m "component: title without verbs"
126-
-m "* NEW Adds your new feature."
127-
-m "* FIX Fixes an existing issue."
128-
-m "* BETTER Improves and existing feature."
129-
-m "* Changes something that should not be visible in release notes."
130128
$ git push origin name-of-your-bugfix-or-feature
131129
132130
8. Submit a pull request through the GitHub website.

0 commit comments

Comments
 (0)