I start my log message with the branch that the commit was made on.
Only the log entries that start with 'master:' are guaranteed to be
fully-working versions
and I can fast forward my merges keeping the details as much as possible in a
linear history.
On 12/6/19 7:55 AM, Christoph Hertzberg wrote:
... snip ...
FF-Merges could actually introduce non-working commits to the main branch (if they are not tested
individually or squashed to a single commit). So I'm actually slightly tending towards the
semi-linear history approach.
Cheers,
Christoph
... snip ...