i wonder if we can change the rebase -i HEAD~3 for a git rebase -i origin/2.3 or origin/master, that is what we use in Gush