Add option to include log in merge commit
Problem to solve
I prefer my merge commits to include logs (e.g. git merge --no-ff --log --message="<Link to MR>"' --no-edit
) and want GitLab to include it by default.
Further details
The current GitLab merge workflow is to create a MR, and hit the 'merge' button to allow for the merge to happen. A merge commit is pre-defined and will always look like: ` <default git merge title 'merges branch into branch'
` The git-cli workflow allows however for this commit message to be more useful.-
It would be nice to also set the '--log' option to get an overview of the merged changes as part of the merge commit. A good description could be 'Add log to merge commit - Populate the log message with one-line descriptions actual commits that are being merged'
-
An option to disable or customize the message
-
Have the option to store the MR description in the merge commit (now it only seems to live in the GitLab database) or is this a bug?
By doing so, it is possible to replicate the more descriptive 'git merge --no-ff --log --message=""' --no-edit' workflow and we could again merge using the GitLab UI, rather then having to manually merge commits.
Proposal
Add a setting to use --log
option when generating a merge commit so that it includes a list of all the changes being added.