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

Re: [PATCH] Let format-patch and rebase ignore trivial merges.

From
BLBernhard R. Link <brl@pcpool00.mathematik.uni-freiburg.de>
Date
Dec 18, 2009, 14:47 UTC
Message-ID
<20091218144756.GA7211@pcpool00.mathematik.uni-freiburg.de>
In-Reply-To
<4B2B8213.1090104@viscovery.net>
* Johannes Sixt <j.sixt@viscovery.net> [091218 14:22]:
Show 8 quoted lines
> > format-patch has to choose a parent. Choosing the first one make the
> > most sense for me (as the first is the only real 'special' one).
> > In the workflows I envision the first parent would also be the one with
> > the clean history.
>
> Then use
>
>    git format-patch --first-parent upstream..

As already described in the thread my mail contained a link to, this will miss patches if there were also real merges (which there will).

But the point that there is only a --first-parent and no --last-parent shows that the first parent is special, so format-patch should choose the first one.

Hochachtungsvoll,
	Bernhard R. Link
-- 
Please do not CC me if also sending to git@vger.kernel.org.
Previous: Johannes SixtNext: Bernhard R. Link
Message 9 of 11 in “Let format-patch and rebase ignore trivial merges.”
  1. Let format-patch and rebase ignore trivial merges.Bernhard R. Link, Dec 16, 2009
  2. Johannes SixtDec 16, 2009
  3. Bernhard R. LinkDec 17, 2009
  4. Johannes SixtDec 17, 2009
  5. Bernhard R. LinkDec 17, 2009
  6. Junio C HamanoDec 17, 2009
  7. Bernhard R. LinkDec 18, 2009
  8. Johannes SixtDec 18, 2009
  9. Bernhard R. LinkDec 18, 2009
  10. Let format-patch and rebase ignore trivial merges.Bernhard R. Link, Dec 18, 2009
  11. Junio C HamanoDec 18, 2009

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.