alias lock for os x
git which-merge <hash> to find which merge commit came after a commit