switch to git-rebase-mode, and also commented-out changes, can't remember what they were for