From: Junio C Hamano Date: Tue, 11 Oct 2011 19:36:13 GMT Subject: Re: Symmetric of rebase / more intelligent cherry-pick Message-ID: <7v8vorfhhu.fsf@alter.siamese.dyndns.org> In-Reply-To: <20111011155444.GB14417@capsaicin.mamane.lu> Lionel Elie Mamane writes: > git cherry-pick ..UPSTREAM > *nearly* does what I want, except that it lacks rebase's intelligence > of skipping commits that do the same textual changes as a commit > already in the current branch. I think in the longer term "--ignore-if-in-upstream" that is known only to format-patch, which is the true source the intelligence of rebase you observed comes from, should be factored out into a helper function that can be used to filter output from get_revision() in other commands, or perhaps get_revision() itself might want to learn it. I say "or perhaps might" above, because I do not think the general revision traversal machinery used by the log family (which cherry-pick's multi-pick option relies on) has enough information to decide what the caller means by "upstream" at the point setup_revisions() is called.