[y4mi]

> Methods: git merge --ff-only or git rebase && git merge (extreme clean freaks add the --squash option)

>> Pros: Linear history, git log is easy to read, git revert requires no thought.

Does it require no thought because it's fundamentally impossible? if you're doing -ff without squashing it's gonna get hard to figure out which commits you'll have to revert I think. All histories get merged into a single stream after all.