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

git format-patch doesn't exclude merged hunks

From
Pádraig Brady <p@draigbrady.com>
Date
May 16, 2012, 15:42 UTC
Message-ID
<4FB3CAE3.6040608@draigBrady.com>

So I was using `git format-patch` to generate patches for consumption by patch (as part of an RPM build), and one of the patches was failing as part of it was already applied.

It seems like format-patch should exclude bits it's merge previously, at least as an option.

For reference the two commits in question are: https://github.com/openstack/nova/commit/7028d66 https://github.com/openstack/nova/commit/26dc6b7 Notice how both make the same change to Authors.

cheers, Pádraig.

Next: Junio C Hamano
Message 1 of 6 in “git format-patch doesn't exclude merged hunks”
  1. Pádraig BradyMay 16, 2012
  2. Junio C HamanoMay 16, 2012
  3. Pádraig BradyMay 16, 2012
  4. Junio C HamanoMay 16, 2012
  5. Pádraig BradyMay 16, 2012
  6. Junio C HamanoMay 16, 2012

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.