Reflog, cherry pick and merge