git merge heuristic

Hi all, I want to learn about how Git compares patches while doing a merge.  For example, if a patch has been cherry-picked from branch A to branch B, and then downstream we do a git merge from A to B, how does Git know to skip the cherry-picked patch?  It would have a different SHA-1, so what

Re: git merge heuristic

On Fri, Mar 22, 2013 at 11:53:04AM -0700, Senthil Natarajan wrote: I want to learn about how Git compares patches while doing a merge.  For example, if a patch has been cherry-picked from branch A to branch B, and then downstream we do a git merge from A to B, how does Git know to skip the