rerere is a lifesaver here.

(I’m also a fan of rebasing; but I also like to land commits that perform a logical and separable chunk of work, because I like history to have decent narrative flow.)

I think you’re trying to handwave at someone who knows more about the steganographic watermarking approach than you do.

I had a small X.25 network as combination coffee-table and space-heater at one point; this was before most homes had internet. It almost cost me a divorce.