Jeff King <peff@xxxxxxxx> writes: > And yes, you can get _too_ general to the point where your semantics > become meaningless. But I don't think that is the case here. You are > defining the origin field as "by the way, the difference between state X > and state Y was used to make this commit". cherry-pick just happens to > make Y=X^, but something like rebase could use a series. Another thing that made me wonder... To be consistent, when you are at HEAD and are merging side branch B, because that merge is to incorporate what happened on the side branch while you are looking the other way, we should say "by the way, the difference between state $(git merge-base HEAD B) and state B was used to make this commit." in the resulting merge commit, shouldn't we? What happens if there is more than one merge base? -- 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