The way I'm reading the comic, it'd be something like "main/master is special", and "always merge in changes". Things that make people assume that forward histo

The way I'm reading the comic, it'd be something like "main/master is special", and "always merge in changes". Things that make people assume that forward history is somehow enforced by the software. But yeah fixing up work and cleaning up a branch prior to merging is a feature not a bug. Git got it right.