{"thread":{"id":"23243","subject":"[PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.","startedAt":"2010-03-29T23:00:49Z","lastAt":"2010-03-30T07:00:18Z","messageCount":5,"participants":["Jon Seymour","Johannes Sixt"],"isPatch":true,"patchVersion":2,"patchTotal":2},"messages":[{"id":"138140","messageId":"2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com","threadId":"23243","inReplyTo":null,"subject":"[PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2010-03-29T23:00:49Z","receivedAt":"2010-03-29T23:00:49Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"Resending because my original patch series wasn't whitespace clean and\nI have now removed the configuration to make the safe behaviour\noptional - it is not safe by default.\n\nIf there is any other reason why this patch should not be considered,\nplease let me know.\n\n[PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to\nencapsulate its derivation.\n[PATCH v2 2/2] git-gui: change to display the diff with the HEAD in\nthe case of conflicts.\n\njon.\n"},{"id":"138143","messageId":"2cfc40321003291602x4cf9fdddsf294e2af6f84d632@mail.gmail.com","threadId":"23243","inReplyTo":"2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com","subject":"Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2010-03-29T23:02:44Z","receivedAt":"2010-03-29T23:02:44Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"| __not__ -> __now__\n\nOn Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour wrote:\n> Resending because my original patch series wasn't whitespace clean and\n> I have now removed the configuration to make the safe behaviour\n> optional - it is __now__ safe by default.\n>\n> If there is any other reason why this patch should not be considered,\n> please let me know.\n>\n> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to\n> encapsulate its derivation.\n> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in\n> the case of conflicts.\n>\n> jon.\n>\n"},{"id":"138144","messageId":"2cfc40321003291608r2b6c7aaap797b4452985438e9@mail.gmail.com","threadId":"23243","inReplyTo":"2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com","subject":"Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2010-03-29T23:08:33Z","receivedAt":"2010-03-29T23:08:33Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"Apologies, it broke again.\n\nThe command I ran to submit the patch was:\n\n git format-patch -M git-gui-patch~2.. --stdout | git imap-send\n\nI did with git 1.6.6.1, running on cygwin however this process appears\nto be corrupting the patch.\n\nCan anyone let me know what I have done wrong?\n\njon.\n\nOn Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour wrote:\n> Resending because my original patch series wasn't whitespace clean and\n> I have now removed the configuration to make the safe behaviour\n> optional - it is not safe by default.\n>\n> If there is any other reason why this patch should not be considered,\n> please let me know.\n>\n> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to\n> encapsulate its derivation.\n> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in\n> the case of conflicts.\n>\n> jon.\n>\n"},{"id":"138163","messageId":"4BB19DBD.90009@viscovery.net","threadId":"23243","inReplyTo":"2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com","subject":"Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-03-30T06:44:13Z","receivedAt":"2010-03-30T06:44:13Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 3/30/2010 1:00, schrieb Jon Seymour:\n> Resending because my original patch series wasn't whitespace clean and\n> I have now removed the configuration to make the safe behaviour\n> optional - it is not safe by default.\n> \n> If there is any other reason why this patch should not be considered,\n> please let me know.\n> \n> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to\n> encapsulate its derivation.\n> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in\n> the case of conflicts.\n\nThe default mode of diff in the case of conflicts is \"condensed combined\",\nwhich removes \"unintersting\" changes from the display. AFAIK, there also\nexists a mode that is only \"combined\". I would think that this mode is\nmuch more useful here because it shows the diff to both HEAD and\nMERGE_HEADs at the same time.\n\nOnly that I don't know how to invoke this mode...\n\n-- Hannes\n"},{"id":"138164","messageId":"2cfc40321003300000k2b106d31iea2cec001c8f27f@mail.gmail.com","threadId":"23243","inReplyTo":"2cfc40321003292359u2b4d3fcfved860ab28338709a@mail.gmail.com","subject":"[PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2010-03-30T07:00:18Z","receivedAt":"2010-03-30T07:00:18Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"And to the list...\n\nOn Tue, Mar 30, 2010 at 5:44 PM, Johannes Sixt wrote:\n> Am 3/30/2010 1:00, schrieb Jon Seymour:\n>> Resending because my original patch series wasn't whitespace clean and\n>> I have now removed the configuration to make the safe behaviour\n>> optional - it is not safe by default.\n>>\n>> If there is any other reason why this patch should not be considered,\n>> please let me know.\n>>\n>> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to\n>> encapsulate its derivation.\n>> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in\n>> the case of conflicts.\n>\n> The default mode of diff in the case of conflicts is \"condensed combined\",\n> which removes \"unintersting\" changes from the display. AFAIK, there also\n> exists a mode that is only \"combined\". I would think that this mode is\n> much more useful here because it shows the diff to both HEAD and\n> MERGE_HEADs at the same time.\n>\n> Only that I don't know how to invoke this mode...\n\nYou mean in a similar way to the way that gitk displays the diff when\nyou select a merge commit?\n\njon.\n"}]}