Formatted tags in commit messages:

We have defined several standard tags you should use; this makes it easy
to search for specific types of contributions. Multiple tags may be used
in the same commit message.
* If other people contributed significantly to a commit, perhaps by
reporting bugs or by writing an initial version of the patch,
acknowledge them using tags at the end of the commit message.
Reported-by: Helpful User <helpful@example.com>
Based-on-patch-by: Original Idea <original@example.com>
Thanks-to: Incremental Improver <improver@example.com>
* If work is done for a particular well defined funding
source or project you should label the commit with one
or more of the tags
Funded-by: My funding source
Project: My project name
Time: n hours
Some possible values for Funded-by:
* P-ECP - preliminary work on the Exascale Computing Project
* IDEAS - work on interoperability/bug fixes with Hypre, SuperLU, Trilinos
* PETSc-ODEs - work funded by Emil, Lois, Barry's base ASCRC program
* PETSc-hierarchical - work funded by the base ASCR program in hierarchical solvers

Commit message template

In order to remember tags for commit messages you can create
a file ~/git/.gitmessage containing the tags. Then on each commit
git automatically includes these in the editor. Just remember to
always delete the ones you do not use. For example I have
Funded-by:
Project:
Time:
Reported-by:
Thanks-to:

It should either be to obtain a specific feature or because some major changes affect you. See the Merging section of the Developer Instructions for more on when to use merges.
When merging to an integration branch, a short summary of the purpose of the topic branch is useful.