Rebase/git 2x support