# [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts. 5 messages from 2010-03-29 to 2010-03-30. Participants: Jon Seymour, Johannes Sixt. Thread: https://gitlist.dev/t/23243 ## Jon Seymour, 2010-03-29 23:00 Subject: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts. Message-ID: <2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com> URL: https://gitlist.dev/e/2cfc40321003291600q70f0839bt8720dd025a3891f6%40mail.gmail.com ``` Resending because my original patch series wasn't whitespace clean and I have now removed the configuration to make the safe behaviour optional - it is not safe by default. If there is any other reason why this patch should not be considered, please let me know. [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to encapsulate its derivation. [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in the case of conflicts. jon. ``` ## Jon Seymour, 2010-03-29 23:02 Subject: Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts. Message-ID: <2cfc40321003291602x4cf9fdddsf294e2af6f84d632@mail.gmail.com> URL: https://gitlist.dev/e/2cfc40321003291602x4cf9fdddsf294e2af6f84d632%40mail.gmail.com In-Reply-To: <2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com> ``` | __not__ -> __now__ On Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour wrote: > Resending because my original patch series wasn't whitespace clean and > I have now removed the configuration to make the safe behaviour > optional - it is __now__ safe by default. > > If there is any other reason why this patch should not be considered, > please let me know. > > [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to > encapsulate its derivation. > [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in > the case of conflicts. > > jon. > ``` ## Jon Seymour, 2010-03-29 23:08 Subject: Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts. Message-ID: <2cfc40321003291608r2b6c7aaap797b4452985438e9@mail.gmail.com> URL: https://gitlist.dev/e/2cfc40321003291608r2b6c7aaap797b4452985438e9%40mail.gmail.com In-Reply-To: <2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com> ``` Apologies, it broke again. The command I ran to submit the patch was: git format-patch -M git-gui-patch~2.. --stdout | git imap-send I did with git 1.6.6.1, running on cygwin however this process appears to be corrupting the patch. Can anyone let me know what I have done wrong? jon. On Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour wrote: > Resending because my original patch series wasn't whitespace clean and > I have now removed the configuration to make the safe behaviour > optional - it is not safe by default. > > If there is any other reason why this patch should not be considered, > please let me know. > > [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to > encapsulate its derivation. > [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in > the case of conflicts. > > jon. > ``` ## Johannes Sixt, 2010-03-30 06:44 Subject: Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts. Message-ID: <4BB19DBD.90009@viscovery.net> URL: https://gitlist.dev/e/4BB19DBD.90009%40viscovery.net In-Reply-To: <2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com> ``` Am 3/30/2010 1:00, schrieb Jon Seymour: > Resending because my original patch series wasn't whitespace clean and > I have now removed the configuration to make the safe behaviour > optional - it is not safe by default. > > If there is any other reason why this patch should not be considered, > please let me know. > > [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to > encapsulate its derivation. > [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in > the case of conflicts. The default mode of diff in the case of conflicts is "condensed combined", which removes "unintersting" changes from the display. AFAIK, there also exists a mode that is only "combined". I would think that this mode is much more useful here because it shows the diff to both HEAD and MERGE_HEADs at the same time. Only that I don't know how to invoke this mode... -- Hannes ``` ## Jon Seymour, 2010-03-30 07:00 Subject: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts. Message-ID: <2cfc40321003300000k2b106d31iea2cec001c8f27f@mail.gmail.com> URL: https://gitlist.dev/e/2cfc40321003300000k2b106d31iea2cec001c8f27f%40mail.gmail.com In-Reply-To: <2cfc40321003292359u2b4d3fcfved860ab28338709a@mail.gmail.com> ``` And to the list... On Tue, Mar 30, 2010 at 5:44 PM, Johannes Sixt wrote: > Am 3/30/2010 1:00, schrieb Jon Seymour: >> Resending because my original patch series wasn't whitespace clean and >> I have now removed the configuration to make the safe behaviour >> optional - it is not safe by default. >> >> If there is any other reason why this patch should not be considered, >> please let me know. >> >> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to >> encapsulate its derivation. >> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in >> the case of conflicts. > > The default mode of diff in the case of conflicts is "condensed combined", > which removes "unintersting" changes from the display. AFAIK, there also > exists a mode that is only "combined". I would think that this mode is > much more useful here because it shows the diff to both HEAD and > MERGE_HEADs at the same time. > > Only that I don't know how to invoke this mode... You mean in a similar way to the way that gitk displays the diff when you select a merge commit? jon. ```