I suspect that if the industry ever moves away from git in the next 5-20 years, ...

I suspect that if the industry ever moves away from git in the next 5-20 years, it will be because there's another SCM that has this capability.

Just like DVCS "solved" branching and merging, following history through renames, splits, and other structural will make SCM 2x better.