To create a useful revision history, teams should first agree on a commit message convention to use, and this also applies to personal projects. Recently I asked a question on Hashnode: "Which commit message convention do you use at work?" and I got quite some amazing responses with users explaining the conventions they use at work and for their personal projects.
In this article, I'll go over why you should write good commit messages and how you can write good commit messages.
Introduction to version control with Git
Version control software is an essential part of the every-day modern-day software developer practices. By far, Git is the most widely used modern version control system in the world today is. It is a distributed and actively maintained open source project originally developed in 2005 by Linus Torvalds, the famous creator of the Linux operating system kernel.
New to Git? Check out the official getting started guide or this slide from my past talk.
What is a commit message?
The commit command is used to save changes to a local repository after staging in Git. However, before you can save a change in Git, you have to tell Git which changes you want to save as you might have made tons of changes. A great way to do that is by adding a commit message to identify your changes.
Commit Options
- -m
This option sets the commit's message.
git add static/admin/config.yml
git commit -m "Setup multiple roles for netlify-cms git gateway"
- -a or --all
This option automatically commits all (including new) tracked, modified, or deleted files.
git commit -a -m "Add a new role for netlify-cms git gateway"
- --amend
This option rewrites the very last commit with any currently staged changes or a new commit message and should only be performed on commits that have not been pushed to a remote repository, yet.
git add .
git commit --amend -m "Update roles for netlify-cms git gateway"
Why should you write good commit messages?
You might say, "It's just a personal project," but yes, you work alone now, but what happens when you work with a team or contribute to open source?
A well-crafted Git commit message is the best way to communicate context about a change to other developers working on that project and indeed to your future self. Have you tried running git log one of your old projects to see the "weird" commit messages you have used since inception? It becomes hard for you to explain why you made some changes in the past, and you wish you have read this article before now :).
Commit messages can adequately tell you why a change was made, and understanding why a change was made makes development and collaboration more efficient.
How to write commit messages with Git
Before now, I only used git commit -m "Fix X to allow Y to use Z" on my personal projects with just a subject and no extra description. This is great for small and clear fixes like git commit -m "Fix typo in README.md but in cases of more extensive changes, you would need to add some extra details.
Editor method
Run git commit without a message or option and it'll open up your default text editor to write a commit message.
To configure your "default" editor:
git config --global core.editor nano
This would configure git to use nano as your default editor. Replace "nano" with "emacs," "vim," or whichever your preference is.
In the opened editor, the first line is the subject (short description), leave a blank line after it, and everything else is the extended description (body).
<Summarize change(s) in around 50 characters or less>
<More detailed explanatory description of the change wrapped into about 72
characters>
Command Line method
git commit -m "Subject" -m "Description..."
The first -m option is the subject (short description), and the next is the extended description (body).
How to write good commit messages
There are several conventions used by several teams and developers to write good commit messages. I'll only outline some general rules and tips for writing commit messages, you would have to decide what convention you want to follow and if you work for a company or contribute to open source, you would have to adapt to their convention :).
For consistency, you can use one convention for work and another for personal projects as you might change your job sometimes, and the convention might change.
Ensure to check this thread for some amazing commit message conventions or add yours to help someone make a decision.
Here's a great template of a good commit message originally written by Tim pope
Capitalized, short (50 chars or less) summary
More detailed explanatory text, if necessary. Wrap it to about 72
characters or so. In some contexts, the first line is treated as the
subject of an email and the rest of the text as the body. The blank
line separating the summary from the body is critical (unless you omit
the body entirely); tools like rebase can get confused if you run the
two together.
Write your commit message in the imperative: "Fix bug" and not "Fixed bug"
or "Fixes bug." This convention matches up with commit messages generated
by commands like git merge and git revert.
Further paragraphs come after blank lines.
- Bullet points are okay, too
- Typically a hyphen or asterisk is used for the bullet, followed by a
single space, with blank lines in between, but conventions vary here
- Use a hanging indent
If you use an issue tracker, add a reference(s) to them at the bottom,
like so:
Resolves: #123
Looks great, right? Here's how you can make yours great too:
Specify the type of commit with a starting short phrase and/or emoji:
feat: The new feature you're adding to a particular application.
fix: A bug fix.
style: Additions and updates related to styling.
refactor: Refactoring a specific section of the codebase.
test: Everything related to testing.
docs: Everything related to documentation.
chore: Regular code maintenance.
Separate the subject from the body with a blank line.
Your commit message should not contain any whitespace error.
Remove unnecessary punctuation marks.
Do not end the subject line with a period.
Capitalize the subject line and each paragraph.
Use the imperative mood in the subject line (e.g., Fix issue…).
Use the body to explain what changes you have made and why you made them.
Do not assume the reviewer understands what the original problem was, ensure you add it.
Do not think your code is self-explanatory.
Follow the commit convention defined by your team.
Conclusion
The most important part of a commit message is that it should be clear and meaningful. In the long run, writing good commit messages shows how much of a collaborator you are, and the benefits of writing good commit messages are not only limited to your team but indeed to yourself and future contributors.
Want to learn more about Git and become a professional "version controller," check out these excellent resources: