Chris Webb <chris@xxxxxxxxxxxx> writes: > + # Set the correct commit message and author info on the > + # sentinel root before cherry-picking the original changes > + # without committing (-n). Finally, update the sentinel again > + # to include these changes. If the cherry-pick results in a > + # conflict, this means our behaviour is similar to a standard > + # failed cherry-pick during rebase, with a dirty index to > + # resolve before manually running git commit --amend then git > + # rebase --continue. Thanks; very readable and understandable. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html