[Geany-devel] GIT commit mails format

[Nick Treleaven]

On 31/10/2011 13:57, Matthew Brush wrote:
>>>> I'm not sure we would see a flood on a merge, probably only one
>>>> commit saying 'merged gtkbuilder branch'? The gtkbuilder commits
>>>> should appear as they are committed, not on merge.
>>>>
>>>
>>> I think when you merge it makes all the commits onto the branch that
>>> was merged into also.  At least this is what happened on the
>>> xfce-commits list when one of the devs merged several branches with a
>>> total of 800+ commits in them, each triggering a commit mail :)

Ok, but ideally it would do as I described, like the github commit list 
for the scintilla-update merge:

https://github.com/geany/geany/commits

>> Isn't --no-ff or --squash not able to prevent this?
>>
>
> IMO, it's not good to mess with the history just to avoid triggering
> commit mails.

Agreed. Besides I would forget to pass those options ;-)