bin/get-extra-pick-list: use git merge-base to get the branchpoint