(no title)
gerardnico | 11 months ago
https://www.conventionalcommits.org/en/v1.0.0/
Ie example of commit message
fix: prevent racing of requests
Desc
Time-spend: Z
gerardnico | 11 months ago
https://www.conventionalcommits.org/en/v1.0.0/
Ie example of commit message
fix: prevent racing of requests
Desc
Time-spend: Z
thisdougb|11 months ago
Having re-looked, I just found 'git rev-parse --verify MERGE_HEAD' which may help here. Time to do some testing. It would be good to clean up and standardise the commit msg itself too. Thanks.
thisdougb|11 months ago
The prepare-commit-msg hook is the one. One of the hook args is the type of commit (merge, squash, etc). And the merge commit msg files exist (SQUASH_MSG, MERGE_MSG) so my original logic all works.