Import the --topo-order change and fix the writing of ~/.gitk.