Simply logic for when to show rebase/merge

Had some problem with isAncestor slowing down the app considerably in larger repos.