add cherry-pick, am and revert popups and sectins, improve rebase and merge popups and sections