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

Re: [PATCH 7/5] Merge changes in "split patch 1" series

From
Jakub Narebski <jnareb@gmail.com>
Date
Aug 5, 2006, 15:05 UTC
Message-ID
<eb2c1o$9d9$1@sea.gmane.org>
In-Reply-To
<Pine.LNX.4.63.0608051654390.1800@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin wrote:
Show 6 quoted lines
> On Sat, 5 Aug 2006, Jakub Narebski wrote:
> 
>> Strange that git-format-patch does not output merges...
> 
> And what exactly should it output? patch against commit^1 or commit^2, 
> etc.? Both? Combined diff?

In my case, commit^1. But I'd be satisfied if it would warn me about missing commit (the merge was topmost commit).

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Johannes Schindelin
Message 26 of 26 in “Some further gitweb patches”
  1. 0/5 Some further gitweb patchesJakub Narebski, Aug 4, 2006
  2. 1/5 gitweb: Cleanup input validation and error messagesJakub Narebski, Aug 4, 2006
  3. Luben TuikovAug 4, 2006
  4. 6/5 gitweb: No periods for error messagesJakub Narebski, Aug 5, 2006
  5. Luben TuikovAug 4, 2006
  6. Junio C HamanoAug 5, 2006
  7. Jakub NarebskiAug 5, 2006
  8. 0/9 gitweb: First patch corrected and split into separate patchesJakub Narebski, Aug 5, 2006
  9. 1/9 gitweb: Separate input validation and dispatch, add comment about opml actionJakub Narebski, Aug 5, 2006
  10. 2/9 gitweb: die_error first (optional) parameter is HTTP statusJakub Narebski, Aug 5, 2006
  11. 3/9 gitweb: Use undef for die_error to use default first (status) parameter valueJakub Narebski, Aug 5, 2006
  12. 4/9 gitweb: Don't undefine query parameter related variables before die_errorJakub Narebski, Aug 5, 2006
  13. 5/9 gitweb: Cleanup and uniquify error messagesJakub Narebski, Aug 5, 2006
  14. 6/9 gitweb: No periods for error messagesJakub Narebski, Aug 5, 2006
  15. Luben TuikovAug 5, 2006
  16. Jakub NarebskiAug 5, 2006
  17. 7/9 gitweb: No error messages with unescaped/unprotected user inputJakub Narebski, Aug 5, 2006
  18. 8/9 gitweb: PATH_INFO=/ means no projectJakub Narebski, Aug 5, 2006
  19. 9/9 gitweb: Inline $rss_linkJakub Narebski, Aug 5, 2006
  20. 2/5 gitweb: Great subroutines renamingJakub Narebski, Aug 4, 2006
  21. 3/5 gitweb: Separate ref parsing in git_read_refs into parse_refJakub Narebski, Aug 4, 2006
  22. 4/5 gitweb: git_heads cleanupJakub Narebski, Aug 4, 2006
  23. 5/5 gitweb: Change appereance of marker of refs pointing to given objectJakub Narebski, Aug 4, 2006
  24. 7/5 Merge changes in "split patch 1" seriesJakub Narebski, Aug 5, 2006
  25. Johannes SchindelinAug 5, 2006
  26. Jakub NarebskiAug 5, 2006

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.