Add rerere, autosetup rebase branches, cntlm proxy