Dealing with merge noise (was: Merging release branch)

[Kévin Le Gouguec]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>> We've discussed this long ago and decided we didn't care.  The master
>> history cannot be clean anyway, because when there's a race between
>> two committers pushing at the same time, one of them will look like a
>> merge from a branch.
>
> Not if the committers rebasing (which I do), but we've already been over
> that.  :-)

(Not sure if this was suggested in past discussions, but maybe sticking
"--no-merges" in vc-git-log-switches can reduce the pain somewhat?)