pull: use merge-base --fork-point when appropriate