From: Senthil Natarajan <snatarajan@stoke.com>
Date: Fri, 22 Mar 2013 18:53:04 GMT
Subject: git merge heuristic
Message-ID: <ECEA5ACFB4B2BC4A81A93F032519ABCAD47F79@minsk.us.stoke.com>

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 is the comparison algorithm/heuristic?  What happens if the comment is different, but the actual patch is identical?

I searched around, but couldn't find information on this.  I would appreciate it if someone could point me in the right direction.

Thanks!

-Senthil