Three months in, and jj is living up to the promise.

jj is a git compatibile version control tool looks promising.