user-manual: Reorganize the reroll sections, adding 'git rebase -i'