Clip. The theory being if the chain wants to snap it will on the weak link, which is the clip, so I carry a spare clip link which only takes a few minutes to fit.
And the only time I fitted a rivet link the chain snapped last Sunday and took out half the bike with it!