Git: show diff between 2 branches (checking whether there was cherry pick or merge)