git cherry pick with same commit id