{"thread":{"id":"21507","subject":"[gitk] [PATCH] 0/2 Merging master into dev","startedAt":"2009-11-06T23:27:37Z","lastAt":"2009-11-14T11:20:10Z","messageCount":3,"participants":["Pat Thoyts","Johannes Schindelin","Paul Mackerras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"127023","messageId":"871vkbw7x2.fsf@users.sourceforge.net","threadId":"21507","inReplyTo":null,"subject":"[gitk] [PATCH] 0/2 Merging master into dev","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2009-11-06T23:27:37Z","receivedAt":"2009-11-06T23:27:37Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"\nI've merged the current changes for gitk master onto the dev branch\nand fixed some conflicts and then modified the default colour\nassignments for windows to use the system colours so that it will pick\nup the stock colours defined via the windows property pages.\n\nHowever, I'm not too certain how to post such a merge commit. Usually\nI do 'git format-patch -M' but in this case that emits all the commits\nthat were merged. It looks like 'git show -p' is producing a merge\npatch so I am posting that for 1/2 and a normal patch for 2/2. If\nthere is better way let me know and I will redo.\n\nNote: these patches are for the gitk dev branch.\n\nHopefully this themed tk version is suitable for merging up to master\nsoon as this will significantly improve the look of the application in\nmsysGit.\n\n-- \nPat Thoyts                            http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD\n"},{"id":"127348","messageId":"alpine.DEB.1.00.0911111751370.19111@intel-tinevez-2-302","threadId":"21507","inReplyTo":"871vkbw7x2.fsf@users.sourceforge.net","subject":"Re: [gitk] [PATCH] 0/2 Merging master into dev","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-11-11T16:52:46Z","receivedAt":"2009-11-11T16:52:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi (especially \"Hi Paul\"),\n\nOn Sat, 6 Nov 2009, Pat Thoyts wrote:\n\n> I've merged the current changes for gitk master onto the dev branch and \n> fixed some conflicts and then modified the default colour assignments \n> for windows to use the system colours so that it will pick up the stock \n> colours defined via the windows property pages.\n> \n> However, I'm not too certain how to post such a merge commit. Usually I \n> do 'git format-patch -M' but in this case that emits all the commits \n> that were merged. It looks like 'git show -p' is producing a merge patch \n> so I am posting that for 1/2 and a normal patch for 2/2. If there is \n> better way let me know and I will redo.\n> \n> Note: these patches are for the gitk dev branch.\n> \n> Hopefully this themed tk version is suitable for merging up to master \n> soon as this will significantly improve the look of the application in \n> msysGit.\n\nI have no illusions about the priority of msysGit-related patches for \ngitk, but it would be nice to get this going again.  (And I want to avoid \nforking gitk just for msysGit.)\n\nPaul?\n\nCiao,\nDscho\n"},{"id":"127543","messageId":"19198.37482.530441.875982@cargo.ozlabs.ibm.com","threadId":"21507","inReplyTo":"871vkbw7x2.fsf@users.sourceforge.net","subject":"Re: [gitk] [PATCH] 0/2 Merging master into dev","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2009-11-14T11:20:10Z","receivedAt":"2009-11-14T11:20:10Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Pat Thoyts writes:\n\n> I've merged the current changes for gitk master onto the dev branch\n> and fixed some conflicts and then modified the default colour\n> assignments for windows to use the system colours so that it will pick\n> up the stock colours defined via the windows property pages.\n> \n> However, I'm not too certain how to post such a merge commit. Usually\n> I do 'git format-patch -M' but in this case that emits all the commits\n> that were merged. It looks like 'git show -p' is producing a merge\n> patch so I am posting that for 1/2 and a normal patch for 2/2. If\n> there is better way let me know and I will redo.\n\nI don't think there is a way to send a merge commit by email.  I think\nyou would have to put a repository somewhere with the merge in it and\ninvite me to pull it.\n\nIn any case, I have just merged the dev branch into the master branch\nand then applied your second patch, and pushed out the result.\n\nPaul.\n"}]}