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

Re: [gitk] [PATCH] 0/2 Merging master into dev

From
Paul Mackerras <paulus@samba.org>
Date
Nov 14, 2009, 11:20 UTC
Message-ID
<19198.37482.530441.875982@cargo.ozlabs.ibm.com>
In-Reply-To
<871vkbw7x2.fsf@users.sourceforge.net>
Pat Thoyts writes:
Show 10 quoted lines
> I've merged the current changes for gitk master onto the dev branch
> and fixed some conflicts and then modified the default colour
> assignments for windows to use the system colours so that it will pick
> up the stock colours defined via the windows property pages.
> 
> However, I'm not too certain how to post such a merge commit. Usually
> I do 'git format-patch -M' but in this case that emits all the commits
> that were merged. It looks like 'git show -p' is producing a merge
> patch so I am posting that for 1/2 and a normal patch for 2/2. If
> there is better way let me know and I will redo.

I don't think there is a way to send a merge commit by email. I think you would have to put a repository somewhere with the merge in it and invite me to pull it.

In any case, I have just merged the dev branch into the master branch and then applied your second patch, and pushed out the result.

Paul.
Previous: Johannes Schindelin
Message 3 of 3 in “0/2 Merging master into dev”
  1. Pat ThoytsNov 6, 2009
  2. Johannes SchindelinNov 11, 2009
  3. Paul MackerrasNov 14, 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.