[Cogito]

> (I forget how git format-patch handles the case where there are two parents.)

As per [0] merge commits are dropped:

Note that format-patch will omit merge commits from the output, even if they are part of the requested range. A simple "patch" does not include enough information for the receiving end to reproduce the same merge commit.

I originally thought it would use --first-parent (so just diff vs the first parent, which is what I would want) but apparently no! It is possible to get this behaviour using git log as detailed in this great write-up [1].

[0] https://git-scm.com/docs/git-format-patch#_caveats

[1] https://stackoverflow.com/questions/2285699/git-how-to-creat...

[kragen]

Thanks! I had no idea.