These changes should be ported to the original git cli command. Really good stuff here!