git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git merge heuristic

From
SNSenthil Natarajan <snatarajan@stoke.com>
Date
Mar 22, 2013, 18:53 UTC
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
Next: Jeff King
Message 1 of 2 in “git merge heuristic”
  1. Senthil NatarajanMar 22, 2013
  2. Jeff KingMar 22, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.