git merge heuristic
From: Senthil Natarajan <hidden>
Date: 2016-06-15 22:56:29
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